Changeset 15211 for trunk/administration

trunk/administration/admin_tools.php

-                      r15201
+                      r15211
 $oAdmTools = new BxDolAdminTools();
 function PageCompAdmTools($oAdmTools) {
     $sRetHtml = $oAdmTools->GenCommonCode();
+    $sRetHtml = $oAdmTools->GenCommonCode();
     switch (bx_get('action')) {
         case 'perm_table':
             $sRetHtml .= $oAdmTools->GenPermTable();
             break;
         case 'main_params':
             $sRetHtml .= $oAdmTools->GenMainParamsTable();
             break;
         case 'main_page':
             $sRetHtml .= $oAdmTools->GenTabbedPage();
             break;
         default:
             $sRetHtml .= $oAdmTools->GenTabbedPage();
             break;
+    }
+    switch (bx_get('action')) {
+        case 'perm_table':
+            $sRetHtml .= $oAdmTools->GenPermTable();
+            break;
+        case 'main_params':
+            $sRetHtml .= $oAdmTools->GenMainParamsTable();
+            break;
+        case 'main_page':
+            $sRetHtml .= $oAdmTools->GenTabbedPage();
+            break;
+        default:
+            $sRetHtml .= $oAdmTools->GenTabbedPage();
+            break;
+    }
     return $sRetHtml;
+    return $sRetHtml;
+}

trunk/administration/advanced_settings.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $logged['admin'] = member_auth( 1, true, true );
 $oSettings = new BxDolAdminSettings(0);
+$oSettings = new BxDolAdminSettings(0);
 //--- Process submit ---//

trunk/administration/antispam.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
             'action' => BX_DOL_URL_ADMIN . 'antispam.php?action=dnsbl_add&mode='.$sDefaultMode,
             'method' => 'post',
             ),
+            ),
             'params' => array (
 …
                 ),
             ),
             'inputs' => array(
+            'inputs' => array(
                 'chain' => array(
 …
                     ),
                     'db' => array (
                         'pass' => 'Xss',
                     ),
                 ),
+                        'pass' => 'Xss',
+                    ),
+                ),
                 'zonedomain' => array(
 …
                     ),
                     'db' => array (
                         'pass' => 'Xss',
+                        'pass' => 'Xss',
                     ),
                 ),
 …
                     ),
                     'db' => array (
                         'pass' => 'Xss',
+                        'pass' => 'Xss',
                     ),
                 ),
 …
                     'caption' => _t('_sys_adm_fld_dnsbl_url'),
                     'db' => array (
                         'pass' => 'Xss',
+                        'pass' => 'Xss',
                     ),
                 ),
 …
                     'caption' => _t('_sys_adm_fld_dnsbl_recheck_url'),
                     'db' => array (
                         'pass' => 'Xss',
+                        'pass' => 'Xss',
                     ),
                 ),
 …
                     'caption' => _t('_sys_adm_fld_dnsbl_comment'),
                     'db' => array (
                         'pass' => 'Xss',
+                        'pass' => 'Xss',
                     ),
                 ),
 …
                     'value' => '1',
                     'db' => array (
                         'pass' => 'Int',
                     ),
                 ),
+                        'pass' => 'Int',
+                    ),
+                ),
                 'Submit' => array (
 …
                     'colspan' => true,
                 ),
             ),
+            ),
         );
 …
+    }
+}
 …
                 'onsubmit' => "return bs_sys_adm_dbsbl_recheck($('#$sId').val());",
                 'method' => 'post',
             ),
+            ),
             'inputs' => array(
 …
                     'colspan' => true,
                 ),
             ),
+            ),
         );
 …
         case 'dnsbl_log':
             $sPopupTitle = _t('_sys_adm_title_dnsbl_log');
+            $sPopupTitle = _t('_sys_adm_title_dnsbl_log');
             $sPopupContent = PageCodeLog ('dnsbl');
             break;
         case 'dnsbluri_log':
             $sPopupTitle = _t('_sys_adm_title_dnsbluri_log');
+            $sPopupTitle = _t('_sys_adm_title_dnsbluri_log');
             $sPopupContent = PageCodeLog ('dnsbluri');
             break;
         case 'akismet_log':
             $sPopupTitle = _t('_sys_adm_title_akismet_log');
+            $sPopupTitle = _t('_sys_adm_title_akismet_log');
             $sPopupContent = PageCodeLog ('akismet');
             break;
 …
         'title' => $sPopupTitle,
         'content' => $sPopupContent,
     );
+    );
     echo $GLOBALS['oFunctions']->transBox($GLOBALS['oSysTemplate']->parseHtmlByName('popup.html', $aVarsPopup), true);
     exit;
 …
         $o = bx_instance('BxDolDNSBlacklists');
         $aChain = $GLOBALS['MySQL']->getAll("SELECT `zonedomain`, `postvresp` FROM `sys_dnsbl_rules` WHERE `id` = '".(int)$_POST['id']."' AND `active` = 1");
         $iRet = BX_DOL_DNSBL_FAILURE;
         if ($aChain) {
 …
                 $sUrl = preg_replace('/^www\./', '', $sUrl);
                 $oBxDolDNSURIBlacklists = bx_instance('BxDolDNSURIBlacklists');
                 $aUrls = $oBxDolDNSURIBlacklists->validateUrls(array($sUrl));
+                $aUrls = $oBxDolDNSURIBlacklists->validateUrls(array($sUrl));
                 if ($aUrls)
                     $iRet = $o->dnsbl_lookup_uri($aUrls[0], $aChain);
 …
     case (isset($_POST['adm-dnsbl-activate'])):
         foreach($_POST['rules'] as $iRuleId)
             db_res("UPDATE `sys_dnsbl_rules` SET `active` = 1 WHERE `id` = " . (int)$iRuleId);
+            db_res("UPDATE `sys_dnsbl_rules` SET `active` = 1 WHERE `id` = " . (int)$iRuleId);
         $oBxDolDNSBlacklists->clearCache();
         break;
 …
     case (isset($_GET['action']) && 'dnsbl_add' == $_GET['action'] && $_POST['dnsbl_add']):
         $oForm = new BxDolAdmFormDnsblAdd ();
         $oForm->initChecker();
+        $oForm->initChecker();
         if ($oForm->isSubmittedAndValid () && $oForm->insert ())
             $sGlMsg = MsgBox(_t('_sys_sucess_result'));
 …
 $sActions = '<div class="dbTopMenu">';
 foreach ($aPages as $k => $r)
     $sActions .= '
+    $sActions .= '
     <div class="' . ($k == $sMode ? 'active' : 'notActive') . '" id="dbmenu_' . $k . '">
         <span>
 …
 $_page = array(
     'name_index' => $iNameIndex,
+    'name_index' => $iNameIndex,
     'header' => $sPageTitle,
     'header_text' => $sPageTitle,
 …
         'adm-dnsbl-deactivate' => _t('_sys_adm_btn_dnsbl_deactivate'),
     ), 'rules');
     $sChains = "'" . implode("','", $aChains) . "'";
 …
         $s = MsgBox(_t('_Empty'));
+    }
     return DesignBoxContent ($GLOBALS['sPageTitle'], $s, 1, $GLOBALS['sActions']);
+}
 …
 function PageCodeRecheckPopup ($aChains, $sFieldTitle, $sId, $sAction) {
     $sChains = "'" . implode("','", $aChains) . "'";
     $aRules = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_dnsbl_rules` WHERE `chain` IN($sChains) AND `active` = 1 ORDER BY `chain`, `added` ");
+    $aRules = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_dnsbl_rules` WHERE `chain` IN($sChains) AND `active` = 1 ORDER BY `chain`, `added` ");
     $oForm = new BxDolAdmFormDnsblRecheck($sFieldTitle, $sId);
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_dnsbl_recheck.html', array(
 …
+}
 function PageCodeLog ($sMode) {
+function PageCodeLog ($sMode) {
     switch ($sMode) {
         case 'dnsbl':
 …
+    }
     $iPage = isset($_GET['page']) && (int)$_GET['page'] > 0 ? (int)$_GET['page'] : 1;
+    $iPage = isset($_GET['page']) && (int)$_GET['page'] > 0 ? (int)$_GET['page'] : 1;
     $iPerPage = 12;
     $iStart = ($iPage-1) * $iPerPage;
     $aLog = $GLOBALS['MySQL']->getAll("SELECT SQL_CALC_FOUND_ROWS * FROM `sys_antispam_block_log` WHERE `type` = '$sMode' ORDER BY `added` DESC LIMIT $iStart, $iPerPage");
     $iCount = $GLOBALS['MySQL']->getOne("SELECT FOUND_ROWS()");

trunk/administration/basic_settings.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $mixedResultPromo = '';
 $oSettings = new BxDolAdminSettings(7);
+$oSettings = new BxDolAdminSettings(7);
 //--- Logo uploading ---//
 if(isset($_POST['upload']) && isset($_FILES['new_file']))
     $mixedResultLogo = setLogo($_POST, $_FILES);
 //--- Promo image uploading ---//
 if(isset($_POST['save_image']) && isset($_FILES['browse_image'])) {
 …
 //--- Promo image deleting ---//
 if (!empty($_GET['delete'])) {
     $sFile = process_pass_data( $_GET['delete'] );
     $sFile = str_replace('\\', '', $sFile);
     $sFile = str_replace('/', '', $sFile);
     $bResult = @unlink($dir['imagesPromo'] . $sFile) && @unlink($dir['imagesPromo'] . 'original/' . $sFile);
     if(!$bResult)
        $mixedResultPromo = '_adm_txt_settings_file_cannot_delete';
+    $sFile = process_pass_data( $_GET['delete'] );
+    $sFile = str_replace('\\', '', $sFile);
+    $sFile = str_replace('/', '', $sFile);
+    $bResult = @unlink($dir['imagesPromo'] . $sFile) && @unlink($dir['imagesPromo'] . 'original/' . $sFile);
+    if(!$bResult)
+       $mixedResultPromo = '_adm_txt_settings_file_cannot_delete';
+}
 …
                 'name' => 'browse_image',
                 'caption' => _t('_adm_txt_settings_promo_browse'),
                 'value' => '',
+                'value' => '',
             ),
             'save_image' => array(
 …
     );
     $oFormImage = new BxTemplFormView($aFormImage);
     $aFormText = array(
         'form_attrs' => array(
 …
                 'html' => 2,
                 'db' => array (
                     'pass' => 'XssHtml',
+                    'pass' => 'XssHtml',
                 ),
             ),
 …
     );
     $oFormText = new BxTemplFormView($aFormText);
     $bPromoImage = getParam('enable_flash_promo') == 'on';
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('promo.html', array(
 …
         'content_text' => $oFormText->getCode()
     ));
     return DesignBoxAdmin(_t('_adm_box_cpt_promo'), $sResult);
+}
 …
+        )
     );
     $oForm = new BxTemplFormView($aForm);
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode()));
     if($mixedResultLogo !== true && !empty($mixedResultLogo))
         $sResult = MsgBox(_t($mixedResultLogo), 3) . $sResult;
 …
     global $dir;
     $aFileInfo = getimagesize($aFile['new_file']['tmp_name']);
     if(empty($aFileInfo))
         return '_adm_txt_settings_file_not_image';
     $sExt = '';
     switch( $aFileInfo['mime'] ) {
         case 'image/jpeg': $sExt = 'jpg'; break;
         case 'image/gif':  $sExt = 'gif'; break;
         case 'image/png':  $sExt = 'png'; break;
+    }
     if(empty($sExt))
         return '_adm_txt_settings_file_wrong_format';
+    $aFileInfo = getimagesize($aFile['new_file']['tmp_name']);
+    if(empty($aFileInfo))
+        return '_adm_txt_settings_file_not_image';
+    $sExt = '';
+    switch( $aFileInfo['mime'] ) {
+        case 'image/jpeg': $sExt = 'jpg'; break;
+        case 'image/gif':  $sExt = 'gif'; break;
+        case 'image/png':  $sExt = 'png'; break;
+    }
+    if(empty($sExt))
+        return '_adm_txt_settings_file_wrong_format';
     $sFileName = mktime() . '.' . $sExt;
     $sFilePath = $dir['mediaImages'] . $sFileName;
     if(!move_uploaded_file($aFile['new_file']['tmp_name'], $sFilePath))
         return '_adm_txt_settings_file_cannot_move';
     if(!empty($aData['resize'])) {
         $iWidth = (int)$aData['new_width'];
         $iHeight = (int)$aData['new_height'];
         if($iWidth <= 0 || $iHeight <= 0)
             return '_adm_txt_settings_logo_wrong_size';
         if(imageResize($sFilePath, $sFilePath, $iWidth, $iHeight) != IMAGE_ERROR_SUCCESS)
             return '_adm_txt_settings_image_cannot_resize';
+    }
     @unlink($dir['mediaImages'] . getParam('sys_main_logo'));
     setParam('sys_main_logo', $sFileName);
     return true;
+    $sFilePath = $dir['mediaImages'] . $sFileName;
+    if(!move_uploaded_file($aFile['new_file']['tmp_name'], $sFilePath))
+        return '_adm_txt_settings_file_cannot_move';
+    if(!empty($aData['resize'])) {
+        $iWidth = (int)$aData['new_width'];
+        $iHeight = (int)$aData['new_height'];
+        if($iWidth <= 0 || $iHeight <= 0)
+            return '_adm_txt_settings_logo_wrong_size';
+        if(imageResize($sFilePath, $sFilePath, $iWidth, $iHeight) != IMAGE_ERROR_SUCCESS)
+            return '_adm_txt_settings_image_cannot_resize';
+    }
+    @unlink($dir['mediaImages'] . getParam('sys_main_logo'));
+    setParam('sys_main_logo', $sFileName);
+    return true;
+}
 function getPromoImages() {
     global $site;
     $aFiles = getPromoImagesArray();
     if(empty($aFiles))
        return MsgBox(_t('_Empty'));
+    $aResult = array();
     foreach($aFiles as $sFile) {
         $aResult[] = array(
+    global $site;
+    $aFiles = getPromoImagesArray();
+    if(empty($aFiles))
+       return MsgBox(_t('_Empty'));
+    $aResult = array();
+    foreach($aFiles as $sFile) {
+        $aResult[] = array(
             'delete_url' => $GLOBALS['site']['url_admin'] . 'basic_settings.php?delete=' . urlencode($sFile),
             'title' => $sFile
         );
+    }
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('promo_images.html', array(
+        );
+    }
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('promo_images.html', array(
         'bx_repeat:images' => $aResult,
         'images_url' => $site['imagesPromo']
 …
     global $dir;
     $aFileInfo = getimagesize($aFile['browse_image']['tmp_name']);
     if(empty($aFileInfo))
         return '_adm_txt_settings_file_not_image';
     $sExt = '';
     switch( $aFileInfo['mime'] ) {
         case 'image/jpeg': $sExt = 'jpg'; break;
         case 'image/gif':  $sExt = 'gif'; break;
         case 'image/png':  $sExt = 'png'; break;
+    }
     if(empty($sExt))
         return '_adm_txt_settings_file_wrong_format';
+    $aFileInfo = getimagesize($aFile['browse_image']['tmp_name']);
+    if(empty($aFileInfo))
+        return '_adm_txt_settings_file_not_image';
+    $sExt = '';
+    switch( $aFileInfo['mime'] ) {
+        case 'image/jpeg': $sExt = 'jpg'; break;
+        case 'image/gif':  $sExt = 'gif'; break;
+        case 'image/png':  $sExt = 'png'; break;
+    }
+    if(empty($sExt))
+        return '_adm_txt_settings_file_wrong_format';
     $sFileName = $aFile['browse_image']['name'];
     $sFilePath = $dir['imagesPromo'] . 'original/' . $sFileName;
     if(!move_uploaded_file($aFile['browse_image']['tmp_name'], $sFilePath))
         return '_adm_txt_settings_file_cannot_move';
+    $sFilePath = $dir['imagesPromo'] . 'original/' . $sFileName;
+    if(!move_uploaded_file($aFile['browse_image']['tmp_name'], $sFilePath))
+        return '_adm_txt_settings_file_cannot_move';
     ResizeAllPromos();
     return true;
+    return true;
+}
 ?>

trunk/administration/cache.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 switch($_POST['type']) {
     case 'all':
         //member menu
         bx_import('BxDolMemberMenu');
+        //member menu
+        bx_import('BxDolMemberMenu');
         $oMemberMenu = new BxDolMemberMenu();
         $oMemberMenu -> deleteMemberMenuCaches();
         // page blocks
         bx_import('BxDolPageViewAdmin');
+        bx_import('BxDolPageViewAdmin');
         $oPageViewCacher = new BxDolPageViewCacher ('', '');
         $oCachePb = $oPageViewCacher->getBlocksCacheObject ();
         $aResult = clearCacheObject ($oCachePb, 'pb_');
         if($aResult['code'] != 0)
+        if($aResult['code'] != 0)
             break;
         // users
         $aResult = clearCache('user', BX_DIRECTORY_PATH_CACHE);
         if($aResult['code'] != 0)
+        if($aResult['code'] != 0)
             break;
 …
         $oCacheDb = $GLOBALS['MySQL']->getDbCacheObject();
         $aResult = clearCacheObject ($oCacheDb, 'db_');
         if($aResult['code'] != 0)
+        if($aResult['code'] != 0)
             break;
 …
         $oCacheTemplates = $GLOBALS['oSysTemplate']->getTemplatesCacheObject();
         $aResult = clearCacheObject($oCacheTemplates, $GLOBALS['oSysTemplate']->_sCacheFilePrefix);
         if($aResult['code'] != 0)
+        if($aResult['code'] != 0)
             break;
         // CSS
         $aResult = clearCache($GLOBALS['oSysTemplate']->_sCssCachePrefix, BX_DIRECTORY_PATH_CACHE_PUBLIC);
         if($aResult['code'] != 0)
+        if($aResult['code'] != 0)
             break;
         // JS
         $aResult = clearCache($GLOBALS['oSysTemplate']->_sJsCachePrefix, BX_DIRECTORY_PATH_CACHE_PUBLIC);
 …
     case 'pb':
         bx_import('BxDolPageViewAdmin');
+        bx_import('BxDolPageViewAdmin');
         $oPageViewCacher = new BxDolPageViewCacher ('', '');
         $oCachePb = $oPageViewCacher->getBlocksCacheObject ();
 …
     case 'users':
         //member menu
         bx_import('BxDolMemberMenu');
+        //member menu
+        bx_import('BxDolMemberMenu');
         $oMemberMenu = new BxDolMemberMenu();
         $oMemberMenu -> deleteMemberMenuCaches();
 …
     case 'js_css':
         $aResult = clearCache($GLOBALS['oSysTemplate']->_sCssCachePrefix, BX_DIRECTORY_PATH_CACHE_PUBLIC);
         if($aResult['code'] == 0)
+        if($aResult['code'] == 0)
             $aResult = clearCache($GLOBALS['oSysTemplate']->_sJsCachePrefix, BX_DIRECTORY_PATH_CACHE_PUBLIC);
         break;
+}
 $oJson = new Services_JSON();
+$oJson = new Services_JSON();
 echo $oJson->encode($aResult);
 exit;
 …
                 @unlink($sPath . $sFile);
+    }
     else
+    else
         $aResult = array('code' => 1, 'message' => _t('_adm_txt_dashboard_cache_clean_failed'));

trunk/administration/categories.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $aBxSecurityExceptions = array ();
 if (bx_get('pathes') !== false) {
     $aPathes = bx_get('pathes');
     if(is_array($aPathes))
         for ($i=0; $i<count($aPathes); ++$i) {
             $aBxSecurityExceptions[] = 'POST.pathes.'.$i;
             $aBxSecurityExceptions[] = 'REQUEST.pathes.'.$i;
+        }
+    $aPathes = bx_get('pathes');
+    if(is_array($aPathes))
+        for ($i=0; $i<count($aPathes); ++$i) {
+            $aBxSecurityExceptions[] = 'POST.pathes.'.$i;
+            $aBxSecurityExceptions[] = 'REQUEST.pathes.'.$i;
+        }
+}
 …
 function actionAllCategories() {
     $oDb = new BxDolDb();
     // check actions
     if(bx_get('pathes') !== false) {
         $aPathes = bx_get('pathes');
         if(is_array($aPathes) && !empty($aPathes))
             foreach($_POST['pathes'] as $sValue) {
                 list($sCategory, $sId, $sType) = split('%%', $sValue);
                 if (bx_get('action_disable') !== flase)
+                    $oDb->query("UPDATE `sys_categories` SET `Status` = 'passive' WHERE
                         `Category` = '$sCategory' AND `ID` = $sId AND `Type` = '$sType'");
                 else if(bx_get('action_delete') !== false)
+                    $oDb->query("DELETE FROM `sys_categories` WHERE
                         `Category` = '$sCategory' AND `ID` = $sId AND `Type` = '$sType'");
+            }
+    }
+        $aPathes = bx_get('pathes');
+        if(is_array($aPathes) && !empty($aPathes))
+            foreach($_POST['pathes'] as $sValue) {
+                list($sCategory, $sId, $sType) = split('%%', $sValue);
+                if (bx_get('action_disable') !== flase)
+                    $oDb->query("UPDATE `sys_categories` SET `Status` = 'passive' WHERE
+                        `Category` = '$sCategory' AND `ID` = $sId AND `Type` = '$sType'");
+                else if(bx_get('action_delete') !== false)
+                    $oDb->query("DELETE FROM `sys_categories` WHERE
+                        `Category` = '$sCategory' AND `ID` = $sId AND `Type` = '$sType'");
+            }
+    }
     $sContent = MsgBox(_t('_Empty'));
     $aModules = array();
     $oCategories = new BxDolCategories();
     $oCategories->getTagObjectConfig();
     if (!empty($oCategories->aTagObjects))
+    {
 …
             if (!$sModule)
                 $sModule = $sKey;
             $aModules[] = array(
                 'value' => $sKey,
 …
             );
+        }
         $sContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('top_block_select.html', array(
             'name' => _t('_categ_modules'),
 …
             'location_href' => BX_DOL_URL_ADMIN . 'categories.php?action=all&module='
         ));
         $aCategories = $oDb->getAll("SELECT * FROM `sys_categories` WHERE `Status` = 'active' AND `Owner` = 0 AND `Type` = '$sModule'");
         if (!empty($aCategories))
+        {
             $aItems = array();
             $sFormName = 'categories_form';
             foreach($aCategories as $aCategory)
+            foreach($aCategories as $aCategory)
+            {
                 $aItems[] = array(
 …
                 );
+            }
             $sControls = $sControls = BxTemplSearchResult::showAdminActionsPanel($sFormName, array(
                 'action_disable' => _t('_categ_btn_disable'),
                 'action_delete' => _t('_categ_btn_delete')
             ), 'pathes');
             $sContent .= $GLOBALS['oAdmTemplate']->parseHtmlByName('categories_list.html', array(
                 'form_name' => $sFormName,
 …
             $sContent .= MsgBox(_t('_Empty'));
+    }
     return $sContent;
+}
 …
     $sFormName = 'categories_aprove_form';
     $aItems = array();
     if(is_array($_POST['pathes']) && !empty($_POST['pathes']))
+    {
 …
+        {
             list($sCategory, $sId, $sType) = split('%%', $sValue);
             $oDb->query("UPDATE `sys_categories` SET `Status` = 'active' WHERE
+            $oDb->query("UPDATE `sys_categories` SET `Status` = 'active' WHERE
                 `Category` = '$sCategory' AND `ID` = $sId AND `Type` = '$sType'");
+        }
+    }
     $aCategories = $oDb->getAll("SELECT * FROM `sys_categories` WHERE `Status` = 'passive'");
     if (!empty($aCategories))
+    {
         foreach($aCategories as $aCategory)
+        foreach($aCategories as $aCategory)
+        {
             $aItems[] = array(
 …
             );
+        }
         $aButtons = array(
             'action_activate' => _t('_categ_btn_activate'),
         );
+        );
         $sControls = BxTemplSearchResult::showAdminActionsPanel($sFormName, $aButtons, 'pathes');
         return $GLOBALS['oAdmTemplate']->parseHtmlByName('categories_list.html', array(
             'form_name' => $sFormName,
 …
+    {
         $oSettings = new BxDolAdminSettings($iId);
         $mixedResult = '';
         if(isset($_POST['save']) && isset($_POST['cat']))
             $mixedResult = $oSettings->saveChanges($_POST);
         $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oSettings->getForm()));
         if($mixedResult !== true && !empty($mixedResult))
             $sResult = $mixedResult . $sResult;
         return $sResult;
+    }
 …
     $aTypes = array();
     $oCateg->getTagObjectConfig();
     foreach ($oCateg->aTagObjects as $sKey => $aValue)
         $aTypes[$sKey] = _t($aValue[$oCateg->aObjFields['lang_key']]);
     $aForm = array(
         'form_attrs' => array(
             'name'     => 'category_form',
 …
             'method'   => 'post',
             'enctype' => 'multipart/form-data',
         ),
+        ),
         'params' => array (
 …
             ),
         ),
         'inputs' => array(
             'name' => array(
                 'type' => 'text',
 …
                     'pass' => 'Xss'
                 ),
             ),
+            ),
             'submit' => array (
                 'type' => 'submit',
 …
                 'value' => _t('_Submit'),
                 'colspan' => false,
             ),
+        )
+            ),
+        )
     );
     return new BxTemplFormView($aForm);
+}
 …
     $oForm->initChecker();
     $sResult = '';
     if ($oForm->isSubmittedAndValid())
+    {
         $oDb = new BxDolDb();
         if ($oDb->getOne("SELECT COUNT(*) FROM `sys_categories` WHERE `Category` = '" .
             $oForm->getCleanValue('Category') . "' AND `ID` = 0 AND `Type` = '" .
+        if ($oDb->getOne("SELECT COUNT(*) FROM `sys_categories` WHERE `Category` = '" .
+            $oForm->getCleanValue('Category') . "' AND `ID` = 0 AND `Type` = '" .
             $oForm->getCleanValue('Type') . "'") == 0)
+        {
 …
                 'Status' => 'active',
             );
             $oForm->insert($aValsAdd);
             header('Location:' . BX_DOL_URL_ADMIN . 'categories.php?action=all&module=' . $oForm->getCleanValue('Type'));
 …
             $sResult = sprintf(_t('_categ_exist_err'), $oForm->getCleanValue('Category'));
+    }
     return (strlen($sResult) > 0 ? MsgBox($sResult) : '') .
         $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode()));
 …
 $aMenu = array(
     'all' => array(
         'title' => _t('_categ_all'),
         'href' => $GLOBALS['site']['url_admin'] . 'categories.php?action=all',
+        'title' => _t('_categ_all'),
+        'href' => $GLOBALS['site']['url_admin'] . 'categories.php?action=all',
         '_func' => array ('name' => 'actionAllCategories', 'params' => array()),
     ),
     'pending' => array(
         'title' => _t('_categ_admin_pending'),
         'href' => $GLOBALS['site']['url_admin'] . 'categories.php?action=pending',
+        'title' => _t('_categ_admin_pending'),
+        'href' => $GLOBALS['site']['url_admin'] . 'categories.php?action=pending',
         '_func' => array ('name' => 'actionPending', 'params' => array()),
     ),
     'settings' => array(
         'title' => _t('_categ_admin_settings'),
+        'title' => _t('_categ_admin_settings'),
         'href' => $GLOBALS['site']['url_admin'] . 'categories.php?action=settings',
         '_func' => array ('name' => 'actionSettings', 'params' => array()),
 …
 );
 $_page_cont[$iNameIndex]['page_main_code'] = DesignBoxAdmin(_t('_categ_form_add'), getAddCategoryForm()) .
+$_page_cont[$iNameIndex]['page_main_code'] = DesignBoxAdmin(_t('_categ_form_add'), getAddCategoryForm()) .
     DesignBoxAdmin($aMenu[$sAction]['title'], $sContent, $aMenu);

trunk/administration/css_file.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $_page_cont[$iNameIndex]['page_main_code'] = PageCodeEdit();
 define('BX_PROMO_CODE', 'on' == getParam('feeds_enable') ? DesignBoxAdmin (_t('_adm_box_cpt_design_templates'), '
     <div class="RSSAggrCont" rssid="boonex_unity_market_templates" rssnum="5" member="0">
         <div class="loading_rss">
             <img src="' . getTemplateImage('loading.gif') . '" alt="' . _t('_loading ...') . '" />
         </div>
+    </div>') : '');
+    <div class="RSSAggrCont" rssid="boonex_unity_market_templates" rssnum="5" member="0">
+        <div class="loading_rss">
+            <img src="' . getTemplateImage('loading.gif') . '" alt="' . _t('_loading ...') . '" />
+        </div>
+    </div>') : '');
 PageCodeAdmin();
 …
             ),
         ),
         'inputs' => array (
+        'inputs' => array (
             'css_file' => array(
                 'type' => 'select',
 …
                 'name' => 'adm-css-save',
                 'value' => _t('_adm_btn_css_save'),
             ),
+            ),
+        )
     );
     //--- Get CSS files ---//
     $aItems = array();
 …
     $rHandle = opendir($sBasePath);
     while(($sFile = readdir($rHandle)) !== false)
         if(is_file($sBasePath . $sFile) && substr($sFile, -3) == 'css')
             $aItems[] = array('key' => $sFile, 'value' => $sFile);
     closedir($rHandle);
+    while(($sFile = readdir($rHandle)) !== false)
+        if(is_file($sBasePath . $sFile) && substr($sFile, -3) == 'css')
+            $aItems[] = array('key' => $sFile, 'value' => $sFile);
+    closedir($rHandle);
     $sCurrentFile = isset($_POST['css_file']) && preg_match("/^\w+\.css$/", $_POST['css_file']) ? $_POST['css_file'] : $aItems[0]['key'];
     $aForm['inputs']['css_file']['value'] = $sCurrentFile;
+    $sCurrentFile = isset($_POST['css_file']) && preg_match("/^\w+\.css$/", $_POST['css_file']) ? $_POST['css_file'] : $aItems[0]['key'];
+    $aForm['inputs']['css_file']['value'] = $sCurrentFile;
     $aForm['inputs']['css_file']['values'] = $aItems;
     //--- Get CSS file's content ---//
     $sContent = '';
     $sAbsolutePath = $sBasePath . $sCurrentFile;
     if(strlen($sCurrentFile) > 0 && is_file($sAbsolutePath) ) {
+       $rHandle = fopen($sAbsolutePath, 'r');
         while(!feof($rHandle))
             $sContent .= fgets($rHandle, 4096);
         fclose($rHandle);
+    }
     //$aForm['inputs']['content']['value'] = isset($_POST['content']) ? $_POST['content'] : $sContent;
     $aForm['inputs']['content']['value'] = $sContent;
+    //--- Get CSS file's content ---//
+    $sContent = '';
+    $sAbsolutePath = $sBasePath . $sCurrentFile;
+    if(strlen($sCurrentFile) > 0 && is_file($sAbsolutePath) ) {
+       $rHandle = fopen($sAbsolutePath, 'r');
+        while(!feof($rHandle))
+            $sContent .= fgets($rHandle, 4096);
+        fclose($rHandle);
+    }
+    //$aForm['inputs']['content']['value'] = isset($_POST['content']) ? $_POST['content'] : $sContent;
+    $aForm['inputs']['content']['value'] = $sContent;
     $oForm = new BxTemplFormView($aForm);
     $oForm->initChecker();
 …
             $rHandle = fopen($sAbsolutePath, 'w');
             if($rHandle) {
                 fwrite($rHandle, clear_xss($_POST['content']));
                 fclose($rHandle);
+                fwrite($rHandle, clear_xss($_POST['content']));
+                fclose($rHandle);
                 $mixedResult = '_adm_txt_css_success_save';
+                $mixedResult = '_adm_txt_css_success_save';
             } else
                 $mixedResult = '_adm_txt_css_failed_save';
+                $mixedResult = '_adm_txt_css_failed_save';
         } else
             $mixedResult = '_adm_txt_css_cannot_write';

trunk/administration/db.php

-                      r15201
+                      r15211
 // TODO: remake according to new design and principles, site setup part leave in admin and remake other functionality move to user part
 /***************************************************************************
 *                            Dolphin Smart Community Builder
 …
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $sBoxContent = <<<EOF
 <style>
     div.hidden {
         display:none;
+    }
+    div.hidden {
+        display:none;
+    }
 </style>
 <script type="text/javascript">
     <!--
     function switchAdmPage(iPageID) {
         //make all tabs - inactive
         //mace selected tab - active
         //hide all pages
         //show selected page
         $(".dbTopMenu").children().removeClass().toggleClass("notActive");
         $("#main_menu" + iPageID).removeClass().toggleClass("active");
         $("#adm_pages").children().removeClass().toggleClass("hidden");
         $("#adm_pages #page" + iPageID).removeClass().toggleClass("visible");
         return false;
+    }
     -->
+    <!--
+    function switchAdmPage(iPageID) {
+        //make all tabs - inactive
+        //mace selected tab - active
+        //hide all pages
+        //show selected page
+        $(".dbTopMenu").children().removeClass().toggleClass("notActive");
+        $("#main_menu" + iPageID).removeClass().toggleClass("active");
+        $("#adm_pages").children().removeClass().toggleClass("hidden");
+        $("#adm_pages #page" + iPageID).removeClass().toggleClass("visible");
+        return false;
+    }
+    -->
 </script>
 <div class="boxContent" id="adm_pages">
     <div id="page1" class="visible">{$sTablesBackupToolsBlock}</div>
     <div id="page2" class="hidden">{$sDatabaseBackupToolsBlock}</div>
+    <div id="page1" class="visible">{$sTablesBackupToolsBlock}</div>
+    <div id="page2" class="hidden">{$sDatabaseBackupToolsBlock}</div>
 </div>
 EOF;
 …
 $sActions = <<<EOF
 <div class="dbTopMenu">
     <div class="active" id="main_menu1"><span><a href="#" class="top_members_menu" onclick="switchAdmPage(1); return false;">{$sTablesC}</a></span></div>
     <div class="notActive" id="main_menu2"><span><a href="#" class="top_members_menu" onclick="switchAdmPage(2); return false;">{$sDatabaseC}</a></span></div>
+    <div class="active" id="main_menu1"><span><a href="#" class="top_members_menu" onclick="switchAdmPage(1); return false;">{$sTablesC}</a></span></div>
+    <div class="notActive" id="main_menu2"><span><a href="#" class="top_members_menu" onclick="switchAdmPage(2); return false;">{$sDatabaseC}</a></span></div>
 </div>
 EOF;
 …
 // Functions
 function getActionResultBlock() {
     $sSuccDumpedIntoFileC = _t('_adm_dbtools_succ_dumped_into_file');
     $sDumpFileSuccDeletedC = _t('_adm_dbtools_Dump_file_succefully_deleted');
     $sPleaseSelectDumpFileC = _t('_adm_dbtools_Please_select_dump_file');
     $sDateRestoredFromDumpC = _t('_adm_dbtools_Data_succefully_restored_from_dump');
     $sPleaseSelectCorrectDumpFileC = _t('_adm_dbtools_Please_select_correct_dump_file');
     $sDateRestoredFromPcC = _t('_adm_dbtools_Data_succefully_restored_from_PC');
+    $sSuccDumpedIntoFileC = _t('_adm_dbtools_succ_dumped_into_file');
+    $sDumpFileSuccDeletedC = _t('_adm_dbtools_Dump_file_succefully_deleted');
+    $sPleaseSelectDumpFileC = _t('_adm_dbtools_Please_select_dump_file');
+    $sDateRestoredFromDumpC = _t('_adm_dbtools_Data_succefully_restored_from_dump');
+    $sPleaseSelectCorrectDumpFileC = _t('_adm_dbtools_Please_select_correct_dump_file');
+    $sDateRestoredFromPcC = _t('_adm_dbtools_Data_succefully_restored_from_PC');
     $status_text = $status_text_restore = '';
     if (isset($_POST['TablesBackup'])) { ##Block of table backup create
+        //echo "For: Tables Tools". $_POST['tbl_op'] . ' Table - ' . $_POST['tbl'] . ' Show param - ' . $_POST['savetype'] ;
         $OutPutType  = preg_replace("/[^0-9]/", '', $_POST['tbl_op']);
         $oNewBackup = new BxDolDatabaseBackup();
+        $oNewBackup -> _getTableStruct($_POST['tbl'],  $OutPutType);
         if ($_POST['savetype'] == 'client') {
             $sqlfile = date("Y-m-d_H:i:s").'_'.$_POST['tbl'].'.sql';
             header("Content-Type: text/plain");
             header("Content-Disposition: attachment;filename=\"".$sqlfile."\"");
             echo $oNewBackup -> sInputs;
             exit();
+        }
         if ($_POST['savetype'] == 'server') {
             $sqlfile = BX_DIRECTORY_PATH_ROOT . 'backup/'.date("Y-m-d_H-i-s").'_'.$_POST['tbl'].'.sql';
             $file = fopen($sqlfile, 'w');
             fputs($file, $oNewBackup -> sInputs);
             $status_text .= "<hr size=1 /><font color='green'><center>{$sSuccDumpedIntoFileC} <b>{$sqlfile}</b></center></font>\n";
             fclose($file);
+        }
         if ($_POST['savetype'] == 'show') {
             $status_text = "<center><textarea cols='100' rows='30' name='content' style='font-family: Arial; font-size: 11px' readonly='readonly'>" . $oNewBackup -> sInputs ."</textarea></center>";
+        }
+    }
     if (isset($_POST['DatabasesBackup'])) {
+        $OutPutType  = preg_replace("/[^0-9]/", '', $_POST['db_op']);
         $oNewBackup = new BxDolDatabaseBackup();
+        $oNewBackup ->  _getAllTables($OutPutType);
         if ($_POST['savetype'] == 'show') {
             $status_text = "<center><textarea cols='100' rows='30' name='content' style='font-family: Arial; font-size: 11px' readonly='readonly'>" . $oNewBackup -> sInputs ."</textarea></center>";
+        }
         if ($_POST['savetype'] == 'server') {
             $sqlfile = BX_DIRECTORY_PATH_ROOT . 'backup/'.date("Y-m-d_H-i-s").'_all.sql';
             $file = fopen($sqlfile, 'w');
             fputs($file, $oNewBackup -> sInputs);
             $status_text .= "<hr size=1 /><font color='green'><center>{$sSuccDumpedIntoFileC} <b>{$sqlfile}</b></center></font>\n";
             fclose($file);
+        }
         if ($_POST['savetype'] == 'client') {
             $sqlfile = date("Y-m-d_H:i:s").'_all.sql';
             header("Content-Type: text/plain");
             header("Content-Disposition: attachment;filename=\"".$sqlfile."\"");
             echo $oNewBackup -> sInputs;
             exit();
+        }
+    }
     if (isset($_POST['DatabasesRestore'])) {
         if ($_POST['savetype'] == 'delete') {
             if(is_file(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file'])) {
                 @unlink(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file']);
                 $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDumpFileSuccDeletedC} <b>{$sqlfile}</b></center></font>\n";
             } else
+                $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectDumpFileC} <b>{$sqlfile}</b></center></font>\n";
+        }
         if ($_POST['savetype'] == 'restore') {
             if(is_file(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file'])) {
                 $oNewBackup = new BxDolDatabaseBackup();
+                $oNewBackup ->  _restoreFromDumpFile(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file']);
                 $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDateRestoredFromDumpC}</center></font>\n";
             } else
                 $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectDumpFileC} <b>{$sqlfile}</b></center></font>\n";
+        }
+    }
     if (isset($_FILES['sqlfile'])) {
         if (preg_match("/.sql/", $_FILES['sqlfile']['name'])) { #it is correct
             $oNewBackup = new BxDolDatabaseBackup();
+            $oNewBackup ->  _restoreFromDumpFile($_FILES['sqlfile']['tmp_name'] );
             @unlink($_FILES['sqlfile']['tmp_name']);
             $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDateRestoredFromPcC} </center></font>\n";
         } else
             $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectCorrectDumpFileC}</center></font>\n";
+    }
     return array($status_text, $status_text_restore);
+    if (isset($_POST['TablesBackup'])) { ##Block of table backup create
+        //echo "For: Tables Tools". $_POST['tbl_op'] . ' Table - ' . $_POST['tbl'] . ' Show param - ' . $_POST['savetype'] ;
+        $OutPutType  = preg_replace("/[^0-9]/", '', $_POST['tbl_op']);
+        $oNewBackup = new BxDolDatabaseBackup();
+        $oNewBackup -> _getTableStruct($_POST['tbl'],  $OutPutType);
+        if ($_POST['savetype'] == 'client') {
+            $sqlfile = date("Y-m-d_H:i:s").'_'.$_POST['tbl'].'.sql';
+            header("Content-Type: text/plain");
+            header("Content-Disposition: attachment;filename=\"".$sqlfile."\"");
+            echo $oNewBackup -> sInputs;
+            exit();
+        }
+        if ($_POST['savetype'] == 'server') {
+            $sqlfile = BX_DIRECTORY_PATH_ROOT . 'backup/'.date("Y-m-d_H-i-s").'_'.$_POST['tbl'].'.sql';
+            $file = fopen($sqlfile, 'w');
+            fputs($file, $oNewBackup -> sInputs);
+            $status_text .= "<hr size=1 /><font color='green'><center>{$sSuccDumpedIntoFileC} <b>{$sqlfile}</b></center></font>\n";
+            fclose($file);
+        }
+        if ($_POST['savetype'] == 'show') {
+            $status_text = "<center><textarea cols='100' rows='30' name='content' style='font-family: Arial; font-size: 11px' readonly='readonly'>" . $oNewBackup -> sInputs ."</textarea></center>";
+        }
+    }
+    if (isset($_POST['DatabasesBackup'])) {
+        $OutPutType  = preg_replace("/[^0-9]/", '', $_POST['db_op']);
+        $oNewBackup = new BxDolDatabaseBackup();
+        $oNewBackup ->  _getAllTables($OutPutType);
+        if ($_POST['savetype'] == 'show') {
+            $status_text = "<center><textarea cols='100' rows='30' name='content' style='font-family: Arial; font-size: 11px' readonly='readonly'>" . $oNewBackup -> sInputs ."</textarea></center>";
+        }
+        if ($_POST['savetype'] == 'server') {
+            $sqlfile = BX_DIRECTORY_PATH_ROOT . 'backup/'.date("Y-m-d_H-i-s").'_all.sql';
+            $file = fopen($sqlfile, 'w');
+            fputs($file, $oNewBackup -> sInputs);
+            $status_text .= "<hr size=1 /><font color='green'><center>{$sSuccDumpedIntoFileC} <b>{$sqlfile}</b></center></font>\n";
+            fclose($file);
+        }
+        if ($_POST['savetype'] == 'client') {
+            $sqlfile = date("Y-m-d_H:i:s").'_all.sql';
+            header("Content-Type: text/plain");
+            header("Content-Disposition: attachment;filename=\"".$sqlfile."\"");
+            echo $oNewBackup -> sInputs;
+            exit();
+        }
+    }
+    if (isset($_POST['DatabasesRestore'])) {
+        if ($_POST['savetype'] == 'delete') {
+            if(is_file(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file'])) {
+                @unlink(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file']);
+                $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDumpFileSuccDeletedC} <b>{$sqlfile}</b></center></font>\n";
+            } else
+                $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectDumpFileC} <b>{$sqlfile}</b></center></font>\n";
+        }
+        if ($_POST['savetype'] == 'restore') {
+            if(is_file(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file'])) {
+                $oNewBackup = new BxDolDatabaseBackup();
+                $oNewBackup ->    _restoreFromDumpFile(BX_DIRECTORY_PATH_ROOT.'backup/'.$_POST['dump_file']);
+                $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDateRestoredFromDumpC}</center></font>\n";
+            } else
+                $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectDumpFileC} <b>{$sqlfile}</b></center></font>\n";
+        }
+    }
+    if (isset($_FILES['sqlfile'])) {
+        if (preg_match("/.sql/", $_FILES['sqlfile']['name'])) { #it is correct
+            $oNewBackup = new BxDolDatabaseBackup();
+            $oNewBackup ->    _restoreFromDumpFile($_FILES['sqlfile']['tmp_name'] );
+            @unlink($_FILES['sqlfile']['tmp_name']);
+            $status_text_restore .= "<hr size=1 /><font color='green'><center>{$sDateRestoredFromPcC} </center></font>\n";
+        } else
+            $status_text_restore .= "<hr size=1 /><font color='red'><center>{$sPleaseSelectCorrectDumpFileC}</center></font>\n";
+    }
+    return array($status_text, $status_text_restore);
+}
 function getTablesBackupTools($status_text) {
     $sChooseOperationC = _t('_adm_dbtools_Choose_operation_and_table');
     $sBackup1C = _t('_adm_dbtools_Backup_structure_content');
     $sBackup2C = _t('_adm_dbtools_Backup_structure');
     $sBackup3C = _t('_adm_dbtools_Backup_content');
     $sSaveOption1C = _t('_adm_dbtools_Save_to_server');
     $sSaveOption2C = _t('_adm_dbtools_Save_to_your_PC');
     $sSaveOption3C = _t('_adm_dbtools_Show_on_the_screen');
     $sBackupTableC = _t('_adm_dbtools_Backup_table');
     $sActionC = _t('_Action');
     // All tables of Database
     $aTablesOptions = array();
     $tbls = db_list_tables();
     while ($tbl = mysql_fetch_array($tbls))  {
         $aTablesOptions[$tbl['0']] = $tbl['0'];
+    }
     $sStatusText = ($status_text and isset($_POST['TablesBackup'])) ? $status_text : '';
     $aForm = array(
         'form_attrs' => array(
             'name' => 'TablesBackupTools_form',
             'action' => $GLOBALS['site']['url_admin'] . 'db.php',
             'method' => 'post',
         ),
         'inputs' => array(
             'TablesBackup' => array(
                 'type' => 'hidden',
                 'name' => 'TablesBackup',
                 'value' => 'YES',
             ),
             'tbl_op' => array(
                 'type' => 'select',
                 'name' => 'tbl_op',
                 'caption' => $sChooseOperationC,
                 'values' => array (
 => $sBackup1C,
 => $sBackup2C,
 => $sBackup3C,
                 ),
             ),
             'tbl' => array(
                 'type' => 'select',
                 'name' => 'tbl',
                 'caption' => '',
                 'values' => $aTablesOptions,
             ),
             'savetype' => array(
                 'type' => 'radio_set',
                 'name' => 'savetype',
                 'caption' => $sActionC,
                 'values' => array (
                     'server' => $sSaveOption1C,
                     'client' => $sSaveOption2C,
                     'show' => $sSaveOption3C,
                 ),
             ),
             'tables_backup_tool' => array(
                 'type' => 'submit',
                 'name' => 'tables_backup_tool',
                 'caption' => '',
                 'value' => $sBackupTableC,
             ),
         ),
     );
     $oForm = new BxTemplFormView($aForm);
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . $sStatusText));
     //return DesignBoxContent(_t('_adm_dbtools_Tables_backup_tools'), '<div style="margin:9px;">' . $oForm->getCode() . '</div>' . $sStatusText, 1);
+    $sChooseOperationC = _t('_adm_dbtools_Choose_operation_and_table');
+    $sBackup1C = _t('_adm_dbtools_Backup_structure_content');
+    $sBackup2C = _t('_adm_dbtools_Backup_structure');
+    $sBackup3C = _t('_adm_dbtools_Backup_content');
+    $sSaveOption1C = _t('_adm_dbtools_Save_to_server');
+    $sSaveOption2C = _t('_adm_dbtools_Save_to_your_PC');
+    $sSaveOption3C = _t('_adm_dbtools_Show_on_the_screen');
+    $sBackupTableC = _t('_adm_dbtools_Backup_table');
+    $sActionC = _t('_Action');
+    // All tables of Database
+    $aTablesOptions = array();
+    $tbls = db_list_tables();
+    while ($tbl = mysql_fetch_array($tbls))  {
+        $aTablesOptions[$tbl['0']] = $tbl['0'];
+    }
+    $sStatusText = ($status_text and isset($_POST['TablesBackup'])) ? $status_text : '';
+    $aForm = array(
+        'form_attrs' => array(
+            'name' => 'TablesBackupTools_form',
+            'action' => $GLOBALS['site']['url_admin'] . 'db.php',
+            'method' => 'post',
+        ),
+        'inputs' => array(
+            'TablesBackup' => array(
+                'type' => 'hidden',
+                'name' => 'TablesBackup',
+                'value' => 'YES',
+            ),
+            'tbl_op' => array(
+                'type' => 'select',
+                'name' => 'tbl_op',
+                'caption' => $sChooseOperationC,
+                'values' => array (
+=> $sBackup1C,
+=> $sBackup2C,
+=> $sBackup3C,
+                ),
+            ),
+            'tbl' => array(
+                'type' => 'select',
+                'name' => 'tbl',
+                'caption' => '',
+                'values' => $aTablesOptions,
+            ),
+            'savetype' => array(
+                'type' => 'radio_set',
+                'name' => 'savetype',
+                'caption' => $sActionC,
+                'values' => array (
+                    'server' => $sSaveOption1C,
+                    'client' => $sSaveOption2C,
+                    'show' => $sSaveOption3C,
+                ),
+            ),
+            'tables_backup_tool' => array(
+                'type' => 'submit',
+                'name' => 'tables_backup_tool',
+                'caption' => '',
+                'value' => $sBackupTableC,
+            ),
+        ),
+    );
+    $oForm = new BxTemplFormView($aForm);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . $sStatusText));
+    //return DesignBoxContent(_t('_adm_dbtools_Tables_backup_tools'), '<div style="margin:9px;">' . $oForm->getCode() . '</div>' . $sStatusText, 1);
+}
 function DatabaseBackupTools($status_text) {
     $sChooseOperationC = _t('_adm_dbtools_Choose_operation');
     $sBackup1C = _t('_adm_dbtools_Backup_structure_content');
     $sBackup2C = _t('_adm_dbtools_Backup_structure');
     $sSaveOption1C = _t('_adm_dbtools_Save_to_server');
     $sSaveOption2C = _t('_adm_dbtools_Save_to_your_PC');
     $sSaveOption3C = _t('_adm_dbtools_Show_on_the_screen');
     $sBackupDatabaseC = _t('_adm_dbtools_Backup_database');
     $sActionC = _t('_Action');
     $sStatusText = ($status_text and isset($_POST['DatabasesBackup'])) ? $status_text : '';
     $aForm = array(
         'form_attrs' => array(
             'name' => 'DatabaseBackupTools_form',
             'action' => $GLOBALS['site']['url_admin'] . 'db.php',
             'method' => 'post',
         ),
         'inputs' => array(
             'DatabasesBackup' => array(
                 'type' => 'hidden',
                 'name' => 'DatabasesBackup',
                 'value' => 'YES',
             ),
             'db_op' => array(
                 'type' => 'select',
                 'name' => 'db_op',
                 'caption' => $sChooseOperationC,
                 'values' => array (
 => $sBackup1C,
 => $sBackup2C,
                 ),
             ),
             'savetype' => array(
                 'type' => 'radio_set',
                 'name' => 'savetype',
                 'caption' => $sActionC,
                 'values' => array (
                     'server' => $sSaveOption1C,
                     'client' => $sSaveOption2C,
                     'show' => $sSaveOption3C,
                 ),
             ),
             'database_backup_tool' => array(
                 'type' => 'submit',
                 'name' => 'database_backup_tool',
                 'caption' => '',
                 'value' => $sBackupDatabaseC,
             ),
         ),
     );
     $oForm = new BxTemplFormView($aForm);
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . $sStatusText));
     //return DesignBoxContent(_t('_adm_dbtools_Database_backup_tools'), '<div style="margin:9px;">' . $oForm->getCode() . '</div>' . $sStatusText, 1);
+    $sChooseOperationC = _t('_adm_dbtools_Choose_operation');
+    $sBackup1C = _t('_adm_dbtools_Backup_structure_content');
+    $sBackup2C = _t('_adm_dbtools_Backup_structure');
+    $sSaveOption1C = _t('_adm_dbtools_Save_to_server');
+    $sSaveOption2C = _t('_adm_dbtools_Save_to_your_PC');
+    $sSaveOption3C = _t('_adm_dbtools_Show_on_the_screen');
+    $sBackupDatabaseC = _t('_adm_dbtools_Backup_database');
+    $sActionC = _t('_Action');
+    $sStatusText = ($status_text and isset($_POST['DatabasesBackup'])) ? $status_text : '';
+    $aForm = array(
+        'form_attrs' => array(
+            'name' => 'DatabaseBackupTools_form',
+            'action' => $GLOBALS['site']['url_admin'] . 'db.php',
+            'method' => 'post',
+        ),
+        'inputs' => array(
+            'DatabasesBackup' => array(
+                'type' => 'hidden',
+                'name' => 'DatabasesBackup',
+                'value' => 'YES',
+            ),
+            'db_op' => array(
+                'type' => 'select',
+                'name' => 'db_op',
+                'caption' => $sChooseOperationC,
+                'values' => array (
+=> $sBackup1C,
+=> $sBackup2C,
+                ),
+            ),
+            'savetype' => array(
+                'type' => 'radio_set',
+                'name' => 'savetype',
+                'caption' => $sActionC,
+                'values' => array (
+                    'server' => $sSaveOption1C,
+                    'client' => $sSaveOption2C,
+                    'show' => $sSaveOption3C,
+                ),
+            ),
+            'database_backup_tool' => array(
+                'type' => 'submit',
+                'name' => 'database_backup_tool',
+                'caption' => '',
+                'value' => $sBackupDatabaseC,
+            ),
+        ),
+    );
+    $oForm = new BxTemplFormView($aForm);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . $sStatusText));
+    //return DesignBoxContent(_t('_adm_dbtools_Database_backup_tools'), '<div style="margin:9px;">' . $oForm->getCode() . '</div>' . $sStatusText, 1);
+}
 function getDatabaseRestoreBlock($status_text) {
     $sPleaseSelectDumpFileC = _t('_adm_dbtools_Please_select_dump_file');
     $sRestoreDataFromDumpC = _t('_adm_dbtools_Restore_data_from_dump');
     $sDeleteDumpFromServerC = _t('_adm_dbtools_Delete_dump_from_server');
     $sDatabaseRestoreFromPCC = _t('_adm_dbtools_Database_restore_from_your_PC');
     $sSendC = _t('_Send');
     $sSubmitC = _t('_Submit');
     $sActionC = _t('_Action');
     $aExistedFilesOptions = array();
     if ( $handle = @opendir(BX_DIRECTORY_PATH_ROOT.'backup/') ) {
+        while ( $file = readdir($handle) ) {
             if ( preg_match("/.sql/", $file) )
                 $aExistedFilesOptions[$file] = $file;
+        }
+    }
     $sStatusText = ($status_text and isset($_POST['DatabasesRestore']) or isset($_FILES['sqlfile']) ) ? $status_text : '';
     $aForm = array(
         'form_attrs' => array(
             'name' => 'DatabaseRestore1_form',
             'action' => $GLOBALS['site']['url_admin'] . 'db.php',
             'method' => 'post',
         ),
         'inputs' => array(
             'DatabasesRestore' => array(
                 'type' => 'hidden',
                 'name' => 'DatabasesRestore',
                 'value' => 'YES',
             ),
             'dump_file' => array(
                 'type' => 'select',
                 'name' => 'dump_file',
                 'caption' => $sPleaseSelectDumpFileC,
                 'values' => $aExistedFilesOptions,
             ),
             'savetype' => array(
                 'type' => 'radio_set',
                 'name' => 'savetype',
                 'caption' => $sActionC,
                 'values' => array (
                     'restore' => $sRestoreDataFromDumpC,
                     'delete' => $sDeleteDumpFromServerC,
                 ),
                 'value' => 'restore',
             ),
             'DatabaseRestore1' => array(
                 'type' => 'submit',
                 'name' => 'DatabaseRestore1',
                 'caption' => '',
                 'value' => $sSubmitC,
             ),
         ),
     );
     $oForm = new BxTemplFormView($aForm);
     $aForm2 = array(
         'form_attrs' => array(
             'name' => 'DatabaseRestore1_form',
             'action' => $GLOBALS['site']['url_admin'] . 'db.php',
             'method' => 'post',
             'enctype' => 'multipart/form-data',
         ),
         'inputs' => array(
             'header1' => array(
                 'type' => 'block_header',
                 'caption' => $sDatabaseRestoreFromPCC,
             ),
             'sqlfile' => array(
                 'type' => 'file',
                 'name' => 'sqlfile',
                 'caption' => $sPleaseSelectDumpFileC,
                 'required' => true,
             ),
             'DatabaseRestore2' => array(
                 'type' => 'submit',
                 'name' => 'DatabaseRestore2',
                 'caption' => '',
                 'value' => $sSendC,
             ),
         ),
     );
     $oForm2 = new BxTemplFormView($aForm2);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . '<br />' . $oForm2->getCode() . $sStatusText));
+    $sPleaseSelectDumpFileC = _t('_adm_dbtools_Please_select_dump_file');
+    $sRestoreDataFromDumpC = _t('_adm_dbtools_Restore_data_from_dump');
+    $sDeleteDumpFromServerC = _t('_adm_dbtools_Delete_dump_from_server');
+    $sDatabaseRestoreFromPCC = _t('_adm_dbtools_Database_restore_from_your_PC');
+    $sSendC = _t('_Send');
+    $sSubmitC = _t('_Submit');
+    $sActionC = _t('_Action');
+    $aExistedFilesOptions = array();
+    if ( $handle = @opendir(BX_DIRECTORY_PATH_ROOT.'backup/') ) {
+        while ( $file = readdir($handle) ) {
+            if ( preg_match("/.sql/", $file) )
+                $aExistedFilesOptions[$file] = $file;
+        }
+    }
+    $sStatusText = ($status_text and isset($_POST['DatabasesRestore']) or isset($_FILES['sqlfile']) ) ? $status_text : '';
+    $aForm = array(
+        'form_attrs' => array(
+            'name' => 'DatabaseRestore1_form',
+            'action' => $GLOBALS['site']['url_admin'] . 'db.php',
+            'method' => 'post',
+        ),
+        'inputs' => array(
+            'DatabasesRestore' => array(
+                'type' => 'hidden',
+                'name' => 'DatabasesRestore',
+                'value' => 'YES',
+            ),
+            'dump_file' => array(
+                'type' => 'select',
+                'name' => 'dump_file',
+                'caption' => $sPleaseSelectDumpFileC,
+                'values' => $aExistedFilesOptions,
+            ),
+            'savetype' => array(
+                'type' => 'radio_set',
+                'name' => 'savetype',
+                'caption' => $sActionC,
+                'values' => array (
+                    'restore' => $sRestoreDataFromDumpC,
+                    'delete' => $sDeleteDumpFromServerC,
+                ),
+                'value' => 'restore',
+            ),
+            'DatabaseRestore1' => array(
+                'type' => 'submit',
+                'name' => 'DatabaseRestore1',
+                'caption' => '',
+                'value' => $sSubmitC,
+            ),
+        ),
+    );
+    $oForm = new BxTemplFormView($aForm);
+    $aForm2 = array(
+        'form_attrs' => array(
+            'name' => 'DatabaseRestore1_form',
+            'action' => $GLOBALS['site']['url_admin'] . 'db.php',
+            'method' => 'post',
+            'enctype' => 'multipart/form-data',
+        ),
+        'inputs' => array(
+            'header1' => array(
+                'type' => 'block_header',
+                'caption' => $sDatabaseRestoreFromPCC,
+            ),
+            'sqlfile' => array(
+                'type' => 'file',
+                'name' => 'sqlfile',
+                'caption' => $sPleaseSelectDumpFileC,
+                'required' => true,
+            ),
+            'DatabaseRestore2' => array(
+                'type' => 'submit',
+                'name' => 'DatabaseRestore2',
+                'caption' => '',
+                'value' => $sSendC,
+            ),
+        ),
+    );
+    $oForm2 = new BxTemplFormView($aForm2);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . '<br />' . $oForm2->getCode() . $sStatusText));
+}

trunk/administration/email_templates.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $logged['admin'] = member_auth( 1, true, true );
 $oSettings = new BxDolAdminSettings(4);
+$oSettings = new BxDolAdminSettings(4);
 //--- Process submit ---//
 …
     if(empty($aTranslation))
         $aTranslation = $GLOBALS['MySQL']->getRow("SELECT `Subject` AS `subject`, `Body` AS `body` FROM `sys_email_templates` WHERE `Name`='" . process_db_input($_POST['templ_name']) . "' AND `LangID`='0' LIMIT 1");
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo $oJson->encode(array('subject' => $aTranslation['subject'], 'body' => $aTranslation['body']));
     exit;
 …
     'css_name' => array('forms_adv.css', 'settings.css'),
     'js_name' => array('email_templates.js'),
     'header' => _t('_adm_page_cpt_email_templates'),
+    'header' => _t('_adm_page_cpt_email_templates'),
 );
 $_page_cont[$iNameIndex] = array(
 …
 function PageCodeSettings($mixedResult) {
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $GLOBALS['oSettings']->getForm()));
+    $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $GLOBALS['oSettings']->getForm()));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = $mixedResult . $sResult;
     return DesignBoxAdmin(_t('_adm_box_cpt_email_settings'), $sResult);
+}
 …
     $aLanguages = $GLOBALS['MySQL']->getAll("SELECT `ID` AS `id`, `Title` AS `title` FROM `sys_localization_languages`");
     $aLanguageChooser = array(array('key' => 0, 'value' => 'default'));
     foreach($aLanguages as $aLanguage)
         $aLanguageChooser[] = array('key' => $aLanguage['id'], 'value' => $aLanguage['title']);
     $sLanguageCpt = _t('_adm_txt_email_language');
     $sSubjectCpt = _t('_adm_txt_email_subject');
 …
         ));
+    }
     $aForm['inputs']['adm-emial-templates-save'] = array(
         'type' => 'submit',
 …
                 $iResult += (int)$GLOBALS['MySQL']->query("INSERT INTO `sys_email_templates` SET `Name`='" . process_db_input($aEmail['name']) . "', `Subject`='" . process_db_input($_POST[$aEmail['name'] . '_Subject']) . "', `Body`='" . process_db_input($_POST[$aEmail['name'] . '_Body']) . "', `LangID`='" . (int)$_POST[$aEmail['name'] . '_Language'] . "'");
+        }
         $sResult .= MsgBox(_t($iResult > 0 ? "_adm_txt_email_success_save" : "_adm_txt_email_nothing_changed"), 3);
+    }

trunk/administration/fields.parse.php

-                      r15201
+                      r15211
 switch(bx_get('action')) {
     case 'getArea':
         genAreaJSON((int)bx_get('id'));
         break;
     case 'createNewBlock':
         createNewBlock();
         break;
     case 'createNewItem':
         createNewItem();
         break;
     case 'savePositions':
         savePositions((int)bx_get('id'));
         break;
     case 'loadEditForm':
         showEditForm((int)bx_get('id'), (int)bx_get('area'));
         break;
     case 'dummy':
         echo 'Dummy!';
         break;
     case 'Save'://save item
         saveItem((int)bx_get('area'), $_POST);
         break;
     case 'Delete'://delete item
         deleteItem((int)bx_get('id'), (int)bx_get('area'));
         break;
+    case 'getArea':
+        genAreaJSON((int)bx_get('id'));
+        break;
+    case 'createNewBlock':
+        createNewBlock();
+        break;
+    case 'createNewItem':
+        createNewItem();
+        break;
+    case 'savePositions':
+        savePositions((int)bx_get('id'));
+        break;
+    case 'loadEditForm':
+        showEditForm((int)bx_get('id'), (int)bx_get('area'));
+        break;
+    case 'dummy':
+        echo 'Dummy!';
+        break;
+    case 'Save'://save item
+        saveItem((int)bx_get('area'), $_POST);
+        break;
+    case 'Delete'://delete item
+        deleteItem((int)bx_get('id'), (int)bx_get('area'));
+        break;
+}
 function createNewBlock() {
     $oFields = new BxDolPFM( 1 );
     $iNewID = $oFields -> createNewBlock();
     header('Content-Type:text/javascript');
     echo '{id:' . $iNewID . '}';
+    $oFields = new BxDolPFM( 1 );
+    $iNewID = $oFields -> createNewBlock();
+    header('Content-Type:text/javascript');
+    echo '{id:' . $iNewID . '}';
+}
 function createNewItem() {
     $oFields = new BxDolPFM( 1 );
     $iNewID = $oFields -> createNewField();
+    $oFields = new BxDolPFM( 1 );
+    $iNewID = $oFields -> createNewField();
     bx_import('BxDolInstallerUtils');
     $oInstallerUtils = new BxDolInstallerUtils();
     $oInstallerUtils->updateProfileFieldsHtml();
     header('Content-Type:text/javascript');
     echo '{id:' . $iNewID . '}';
+    bx_import('BxDolInstallerUtils');
+    $oInstallerUtils = new BxDolInstallerUtils();
+    $oInstallerUtils->updateProfileFieldsHtml();
+    header('Content-Type:text/javascript');
+    echo '{id:' . $iNewID . '}';
+}
 function genAreaJSON( $iAreaID ) {
     $oFields = new BxDolPFM( $iAreaID );
     header( 'Content-Type:text/javascript' );
     echo $oFields -> genJSON();
+    $oFields = new BxDolPFM( $iAreaID );
+    header( 'Content-Type:text/javascript' );
+    echo $oFields -> genJSON();
+}
 function savePositions( $iAreaID ) {
+    $oFields = new BxDolPFM( $iAreaID );
+    header( 'Content-Type:text/javascript' );
+    $oFields -> savePositions( $_POST );
+    $oFields = new BxDolPFM( $iAreaID );
+    $oCacher = new BxDolPFMCacher();
+    $oCacher -> createCache();
+    header( 'Content-Type:text/javascript' );
+    $oFields -> savePositions( $_POST );
+    $oCacher = new BxDolPFMCacher();
+    $oCacher -> createCache();
+}
 function saveItem( $iAreaID, $aData ) {
     $oFields = new BxDolPFM( $iAreaID );
     $oFields -> saveItem( $_POST );
+    $oFields = new BxDolPFM( $iAreaID );
+    $oFields -> saveItem( $_POST );
     bx_import('BxDolInstallerUtils');
     $oInstallerUtils = new BxDolInstallerUtils();
     $oInstallerUtils->updateProfileFieldsHtml();
+    bx_import('BxDolInstallerUtils');
+    $oInstallerUtils = new BxDolInstallerUtils();
+    $oInstallerUtils->updateProfileFieldsHtml();
     $oCacher = new BxDolPFMCacher();
     $oCacher -> createCache();
+    $oCacher = new BxDolPFMCacher();
+    $oCacher -> createCache();
+}
 function deleteItem( $iItemID, $iAreaID ) {
     $oFields = new BxDolPFM( $iAreaID );
     $oFields -> deleteItem( $iItemID );
+    $oFields = new BxDolPFM( $iAreaID );
+    $oFields -> deleteItem( $iItemID );
     bx_import('BxDolInstallerUtils');
     $oInstallerUtils = new BxDolInstallerUtils();
     $oInstallerUtils->updateProfileFieldsHtml();
+    bx_import('BxDolInstallerUtils');
+    $oInstallerUtils = new BxDolInstallerUtils();
+    $oInstallerUtils->updateProfileFieldsHtml();
     $oCacher = new BxDolPFMCacher();
     $oCacher -> createCache();
+    $oCacher = new BxDolPFMCacher();
+    $oCacher -> createCache();
+}
 function showEditForm( $iItemID, $iAreaID ) {
     $oFields = new BxDolPFM( $iAreaID );
     ob_start();
     ?>
     <form name="fieldEditForm" method="post" action="<?=$GLOBALS['site']['url_admin'] . 'fields.parse.php'; ?>" target="fieldFormSubmit" onsubmit="clearFormErrors( this )">
+    $oFields = new BxDolPFM( $iAreaID );
+    ob_start();
+    ?>
+    <form name="fieldEditForm" method="post" action="<?=$GLOBALS['site']['url_admin'] . 'fields.parse.php'; ?>" target="fieldFormSubmit" onsubmit="clearFormErrors( this )">
         <div class="edit_item_table_cont">
             <?=$oFields -> genFieldEditForm( $iItemID ); ?>
         </div>
     </form>
+    </form>
     <iframe name="fieldFormSubmit" style="display:none;"></iframe>
     <?
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => ob_get_clean()));
+    <iframe name="fieldFormSubmit" style="display:none;"></iframe>
+    <?
+    $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => ob_get_clean()));
     echo PopupBox('pf_edit_popup', _t('_adm_fields_box_cpt_field'), $sResult);
+    echo PopupBox('pf_edit_popup', _t('_adm_fields_box_cpt_field'), $sResult);
+}

trunk/administration/fields.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
     'css_name' => array('fields.css'),
     'js_name' => array('ui.core.js', 'ui.tabs.js', 'ui.sortable.js', 'fields.js'),
     'header' => _t('_adm_fields_title')
+    'header' => _t('_adm_fields_title')
 );
 $_page_cont[$iNameIndex]['page_main_code'] = DesignBoxAdmin(
 …
     array(
         'adm-fb-ctl-m1' => array(
             'title' => _t('_adm_fields_join_form'),
+            'title' => _t('_adm_fields_join_form'),
             'href' => 'javascript:void(0)',
             'onclick' => 'javascript:changeType(this)',
 …
 $GLOBALS['oAdmTemplate']->addJsTranslation(array(
     '_adm_mbuilder_active_items',
     '_adm_txt_pb_inactive_blocks',
     '_adm_mbuilder_inactive_items'
+    '_adm_mbuilder_active_items',
+    '_adm_txt_pb_inactive_blocks',
+    '_adm_mbuilder_inactive_items'
 ));

trunk/administration/flash.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/

trunk/administration/help.html

-                      r15201
+                      r15211
     .spec
+    {
         float:left;
         width:80px;
         height:20px;
         position:relative;
         border: 1px solid silver;
         text-align : center;
+    }
+    {
+        float:left;
+        width:80px;
+        height:20px;
+        position:relative;
+        border: 1px solid silver;
+        text-align : center;
+    }
     .desc
+    {
         float:left;
         width:360px;
         height:20px;
         position:relative;
         border: 1px solid silver;
+    }
+    {
+        float:left;
+        width:360px;
+        height:20px;
+        position:relative;
+        border: 1px solid silver;
+    }
 </style>
 …
 <table border=1>
 <tr >
     <td ><b>Separator</b></td>
     <td><b>Format</b></td>
     <td><b>Result</b></td>
+    <td ><b>Separator</b></td>
+    <td><b>Format</b></td>
+    <td><b>Result</b></td>
 </tr>
 <tr align=center>
     <td>.</td>
     <td>Day.Month.YYYY</td>
     <td>%d.%m.%Y</td>
+    <td>.</td>
+    <td>Day.Month.YYYY</td>
+    <td>%d.%m.%Y</td>
 </tr>
 <tr align=center>
     <td>/</td>
     <td>Month/Day/Year</td>
     <td>%m/%d/%Y</td>
+    <td>/</td>
+    <td>Month/Day/Year</td>
+    <td>%m/%d/%Y</td>
 </tr>
 <tr align=center>
     <td>*</td>
     <td>Month*Day*Year</td>
     <td>%m*%d*%Y</td>
+    <td>*</td>
+    <td>Month*Day*Year</td>
+    <td>%m*%d*%Y</td>
 </tr>
 <tr align=center>
     <td colspan=3 >some other separators:   -    :    ;    -- </b></td>
+    <td colspan=3 >some other separators:   -    :    ;    -- </b></td>
 </tr>

trunk/administration/host_tools.php

-                      r15201
+                      r15211
 switch(bx_get('action')) {
     case 'cache_engines':
         $sResult .= $oAdmTools->GenCacheEnginesTable();
         break;
     case 'perm_table':
         $sResult .= $oAdmTools->GenPermTable();
         break;
     case 'main_params':
         $sResult .= $oAdmTools->GenMainParamsTable();
         break;
     case 'main_page':
         $sResult .= $oAdmTools->GenTabbedPage();
         break;
     default:
         $sResult .= $oAdmTools->GenTabbedPage();
         break;
+    case 'cache_engines':
+        $sResult .= $oAdmTools->GenCacheEnginesTable();
+        break;
+    case 'perm_table':
+        $sResult .= $oAdmTools->GenPermTable();
+        break;
+    case 'main_params':
+        $sResult .= $oAdmTools->GenMainParamsTable();
+        break;
+    case 'main_page':
+        $sResult .= $oAdmTools->GenTabbedPage();
+        break;
+    default:
+        $sResult .= $oAdmTools->GenTabbedPage();
+        break;
+}

trunk/administration/index.php

-                      r15201
+                      r15211
     $iId = getID($_POST['ID']);
     $sPassword = bx_process_input($_POST['Password']);
     $oZ = new BxDolAlerts('profile', 'before_login', 0, 0, array('login' => $iId, 'password' => $sPassword, 'ip' => getVisitorIP()));
     $oZ->alert();
 …
             db_res("insert into `sys_options` (`Name`, `VALUE`, `desc`, `Type`) values ('enable_dolphin_footer', 'on', 'enable boonex footers', 'checkbox')");
         if ((isset($_REQUEST['license_code']) && $_REQUEST['license_code']) || (getParam("license_expiration") && time() > getParam("license_expiration"))) {
+        if ((isset($_REQUEST['license_code']) && $_REQUEST['license_code']) || (getParam("license_expiration") && time() > getParam("license_expiration"))) {
             $bDol = checkDolphinLicense();
             setParam('enable_dolphin_footer', ($bDol ? '' : 'on'));
         } elseif (getParam("license_code")) {
             $sDomain = BX_DOL_URL_ROOT;
             if (preg_match('/https?:\/\/([a-zA-Z0-9\.-]+)[:\/]/', $sDomain, $m)) $sDomain = str_replace('www.','',$m[1]);
+            $sDomain = BX_DOL_URL_ROOT;
+            if (preg_match('/https?:\/\/([a-zA-Z0-9\.-]+)[:\/]/', $sDomain, $m)) $sDomain = str_replace('www.','',$m[1]);
             $s = md5(base64_encode(serialize(array(getParam("enable_dolphin_footer"), getParam("license_code"), getParam("license_expiration"), $sDomain)))); for ($i=0 ; $i<32 ; ++$i) $s[$i] = ord($s[$i]) + $i; $s = md5($s);
             if ($s != getParam("license_checksum")) {
 …
 if(!isAdmin()) {
     send_headers_page_changed();
     login_form("", 1);
     exit();
+    send_headers_page_changed();
+    login_form("", 1);
+    exit();
+}
 if(bx_get('boonex_news') !== false)
     setParam("news_enable", (int)bx_get('boonex_news'));
+    setParam("news_enable", (int)bx_get('boonex_news'));
 $logged['admin'] = member_auth( 1, true, true );
 if(bx_get('cat') !== false)
     PageCategoryCode(bx_get('cat'));
 else
+    PageCategoryCode(bx_get('cat'));
+else
     PageMainCode();
 …
     bx_import('BxDolAdminDashboard');
     $sHtml = DesignBoxAdmin(_t('_adm_box_cpt_overview'), BxDolAdminDashboard::getCode());
 …
         $sHtml .= DesignBoxAdmin (_t('_adm_box_cpt_featured_modules'), BxTemplFunctions::getInstance()->getRssHolder ('boonex_unity_market_featured', 5, 0, $oTemplate));
+    }
     $oTemplate->setPageNameIndex (BX_PAGE_DEFAULT);
     $oTemplate->setPageHeader (_t('_adm_page_cpt_dashboard'));
 …
 function PageCategoryCode($sCategoryName) {
     $oDb = BxDolDb::getInstance();
+    $oDb = BxDolDb::getInstance();
     $oTemplate = BxDolTemplateAdmin::getInstance();
     $aItems = $oDb->getAll("SELECT `tma1`.`title` AS `title`, `tma1`.`url` AS `url`, `tma1`.`description` AS `description`, `tma1`.`icon` AS `icon`, `tma1`.`check` AS `check` FROM `sys_menu_admin` AS `tma1` LEFT JOIN `sys_menu_admin` AS `tma2` ON `tma1`.`parent_id`=`tma2`.`id` WHERE `tma2`.`name`='" . $sCategoryName . "' ORDER BY `tma1`.`Order`");
+    $aItems = $oDb->getAll("SELECT `tma1`.`title` AS `title`, `tma1`.`url` AS `url`, `tma1`.`description` AS `description`, `tma1`.`icon` AS `icon`, `tma1`.`check` AS `check` FROM `sys_menu_admin` AS `tma1` LEFT JOIN `sys_menu_admin` AS `tma2` ON `tma1`.`parent_id`=`tma2`.`id` WHERE `tma2`.`name`='" . $sCategoryName . "' ORDER BY `tma1`.`Order`");
     foreach($aItems as $aItem) {
         if(strlen($aItem['check']) > 0) {
             $oFunction = create_function('', $aItem['check']);
             if(!$oFunction())
+    foreach($aItems as $aItem) {
+        if(strlen($aItem['check']) > 0) {
+            $oFunction = create_function('', $aItem['check']);
+            if(!$oFunction())
                 continue;
+        }
+        }
         $aItem['url'] = str_replace(array('{siteUrl}', '{siteAdminUrl}'), array(BX_DOL_URL_ROOT, BX_DOL_URL_ADMIN), $aItem['url']);
         list($sLink, $sOnClick) = BxDolAdminMenu::getMainMenuLink($aItem['url']);
         $aVariables[] = array(
+        $aItem['url'] = str_replace(array('{siteUrl}', '{siteAdminUrl}'), array(BX_DOL_URL_ROOT, BX_DOL_URL_ADMIN), $aItem['url']);
+        list($sLink, $sOnClick) = BxDolAdminMenu::getMainMenuLink($aItem['url']);
+        $aVariables[] = array(
             'icon' => $oTemplate->getIconUrl($aItem['icon']),
             'link' => $sLink,
 …
             'title' => _t($aItem['title']),
             'description' => $aItem['description']
         );
+    }
+        );
+    }
     $sPageTitle = _t($oDb->getOne("SELECT `title` FROM `sys_menu_admin` WHERE `name`='" . $sCategoryName . "' LIMIT 1"));
     $sPageContent = $oTemplate->parseHtmlByName('categories.html', array('bx_repeat:items' => $aVariables));
+    $sPageTitle = _t($oDb->getOne("SELECT `title` FROM `sys_menu_admin` WHERE `name`='" . $sCategoryName . "' LIMIT 1"));
+    $sPageContent = $oTemplate->parseHtmlByName('categories.html', array('bx_repeat:items' => $aVariables));
     $sPageContent = DesignBoxAdmin($sPageTitle, $sPageContent);

trunk/administration/ip_blacklist.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $sResult = '';
 switch(bx_get('action')) {
     case 'apply_delete':
         $oBxDolAdminIpBlockList->ActionApplyDelete();
         $sResult .= $oBxDolAdminIpBlockList->GenIPBlackListTable();
         break;
+    case 'apply_delete':
+        $oBxDolAdminIpBlockList->ActionApplyDelete();
+        $sResult .= $oBxDolAdminIpBlockList->GenIPBlackListTable();
+        break;
+}

trunk/administration/js/email_templates.js

-                      r15201
+                      r15211
     var iLangId = $(oSelect).val();
     var sTemplName = $(oSelect).attr('name').replace('_Language', '');
     $('#adm-email-loading').bx_loading();
     $.post(
         sAdminUrl + 'email_templates.php',
 …
         function(oResult) {
             $('#adm-email-loading').bx_loading();
             $("[name='" + sTemplName + "_Subject']").val(oResult.subject);
             $("[name='" + sTemplName + "_Body']").val(oResult.body);

trunk/administration/js/fields.js

-                      r15201
+                      r15211
 function BxDolPFM( aAreas ) {
     this.config = {
         areas: 0,
         parserUrl: '',
         inactiveColumns: 4,
         getAreaElem : function(id) { //function to get the area element. made to customizability
             var $area = $( '#m' + id + ' > div.build_container' );
+    this.config = {
+        areas: 0,
+        parserUrl: '',
+        inactiveColumns: 4,
+        getAreaElem : function(id) { //function to get the area element. made to customizability
+            var $area = $( '#m' + id + ' > div.build_container' );
             return $area.length ? $area.get(0) : false;
+        }
     };
     this.areas = new Array();
+        }
+    };
+    this.areas = new Array();
+}
 …
 BxDolPFM.prototype.init = function() {
     //generate areas
+    //generate areas
     for (var iInd = 1; iInd <= this.config.areas; iInd ++) { //we will begin ID's from 1 !
         var area = new BxDolPFMArea(this, iInd);
         if (!area.element)
             continue;
         this.areas[this.areas.length] = area;
+    }
 …
 BxDolPFM.prototype.getAreaByID = function( iAreaID ) {
     for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ )
         if( this.areas[iAreaInd].id == iAreaID )
             return this.areas[iAreaInd];
     return false;
+    for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ )
+        if( this.areas[iAreaInd].id == iAreaID )
+            return this.areas[iAreaInd];
+    return false;
+}
 BxDolPFM.prototype.updateAreas = function( sText, iItemID, sNewName, iAreaID ) {
     switch( sText ) {
         case 'deleteItem':
             location.reload();
         break;
         case 'updateItem':
             for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ )
                 this.areas[iAreaInd].getItemOrBlockByID( iItemID ).updateName( sNewName );
         break;
         case 'newBlock':
             if( !iItemID ) {
                 alert( 'Sorry couldn\'t insert new block. Please check if NEW BLOCK already exists.' );
                 this.getAreaByID( iAreaID ).moveFakeBlockBack();
             } else {
                 for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ ) {
                     var oArea = this.areas[iAreaInd];
                     oArea.insertNewBlock( iItemID );
                     oArea.moveFakeBlockBack();
                     if( oArea.id == iAreaID )
                         oArea.resortAndSubmit();
                     else
                         oArea.resortArrays(); // do not submit positions for other areas
+                }
+            }
         break;
         case 'newItem':
             if( !iItemID ) {
                 alert( 'Sorry couldn\'t insert new item. Please check if NEW_ITEM already exists.' );
                 this.getAreaByID( iAreaID ).moveFakeItemBack();
             } else {
                 for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ ) {
                     var oArea = this.areas[iAreaInd];
                     oArea.insertNewItem( iItemID );
                     oArea.moveFakeItemBack();
                     if( oArea.id == iAreaID )
                         oArea.resortAndSubmit();
                     else
                         oArea.resortArrays(); // do not submit positions for other areas
+                }
+            }
         break;
+    }
+    switch( sText ) {
+        case 'deleteItem':
+            location.reload();
+        break;
+        case 'updateItem':
+            for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ )
+                this.areas[iAreaInd].getItemOrBlockByID( iItemID ).updateName( sNewName );
+        break;
+        case 'newBlock':
+            if( !iItemID ) {
+                alert( 'Sorry couldn\'t insert new block. Please check if NEW BLOCK already exists.' );
+                this.getAreaByID( iAreaID ).moveFakeBlockBack();
+            } else {
+                for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ ) {
+                    var oArea = this.areas[iAreaInd];
+                    oArea.insertNewBlock( iItemID );
+                    oArea.moveFakeBlockBack();
+                    if( oArea.id == iAreaID )
+                        oArea.resortAndSubmit();
+                    else
+                        oArea.resortArrays(); // do not submit positions for other areas
+                }
+            }
+        break;
+        case 'newItem':
+            if( !iItemID ) {
+                alert( 'Sorry couldn\'t insert new item. Please check if NEW_ITEM already exists.' );
+                this.getAreaByID( iAreaID ).moveFakeItemBack();
+            } else {
+                for( var iAreaInd = 0; iAreaInd < this.areas.length; iAreaInd ++ ) {
+                    var oArea = this.areas[iAreaInd];
+                    oArea.insertNewItem( iItemID );
+                    oArea.moveFakeItemBack();
+                    if( oArea.id == iAreaID )
+                        oArea.resortAndSubmit();
+                    else
+                        oArea.resortArrays(); // do not submit positions for other areas
+                }
+            }
+        break;
+    }
+}
 …
 function BxDolPFMArea(parent, id) {
     this.id     = id;
     this.parent = parent;
+    this.id     = id;
+    this.parent = parent;
     this.getElement();
     if (!this.element)
         return false;
     this.active_blocks      = new Array();
     this.inactive_blocks    = new Array();
     this.active_items       = new Array();
     this.inactive_items     = new Array();
     this.activeZoneElemID         = 'area_' + this.id + '_active'
     this.inactiveItemsZoneElemID  = 'area_' + this.id + '_items_inactive'
     this.inactiveBlocksZoneElemID = 'area_' + this.id + '_blocks_inactive'
     this.requestData();
+    this.active_blocks      = new Array();
+    this.inactive_blocks    = new Array();
+    this.active_items       = new Array();
+    this.inactive_items     = new Array();
+    this.activeZoneElemID         = 'area_' + this.id + '_active'
+    this.inactiveItemsZoneElemID  = 'area_' + this.id + '_items_inactive'
+    this.inactiveBlocksZoneElemID = 'area_' + this.id + '_blocks_inactive'
+    this.requestData();
+}
 BxDolPFMArea.prototype.getElement = function() {
     this.element = this.parent.config.getAreaElem(this.id);
+    this.element = this.parent.config.getAreaElem(this.id);
+}
 BxDolPFMArea.prototype.requestData = function() {
     var oThisArea = this;
     $.getJSON(
         this.parent.config.parserUrl,
         {action: 'getArea', id: this.id},
         function(oAreaData){
             oThisArea.getData(oAreaData);
+        }
     );
+    var oThisArea = this;
+    $.getJSON(
+        this.parent.config.parserUrl,
+        {action: 'getArea', id: this.id},
+        function(oAreaData){
+            oThisArea.getData(oAreaData);
+        }
+    );
+}
 BxDolPFMArea.prototype.getData = function(oAreaData) {
     if( this.id != oAreaData.id )
         return false;
     for( var iBlockInd = 0; iBlockInd < oAreaData.active_blocks.length;   iBlockInd++ )    this.active_blocks[   this.active_blocks.length   ] = new BxDolPFMBlock( this, oAreaData.active_blocks[   iBlockInd ] );
     for( var iBlockInd = 0; iBlockInd < oAreaData.inactive_blocks.length; iBlockInd++ )    this.inactive_blocks[ this.inactive_blocks.length ] = new BxDolPFMBlock( this, oAreaData.inactive_blocks[ iBlockInd ] );
     for( var iItemInd  = 0; iItemInd  < oAreaData.active_items.length;    iItemInd ++ )    this.active_items[    this.active_items.length    ] = new BxDolPFMItem(  this, oAreaData.active_items[    iItemInd  ] );
     for( var iItemInd  = 0; iItemInd  < oAreaData.inactive_items.length;  iItemInd ++ )    this.inactive_items[  this.inactive_items.length  ] = new BxDolPFMItem(  this, oAreaData.inactive_items[  iItemInd  ] );
     this.draw();
+    if( this.id != oAreaData.id )
+        return false;
+    for( var iBlockInd = 0; iBlockInd < oAreaData.active_blocks.length;   iBlockInd++ )    this.active_blocks[   this.active_blocks.length   ] = new BxDolPFMBlock( this, oAreaData.active_blocks[   iBlockInd ] );
+    for( var iBlockInd = 0; iBlockInd < oAreaData.inactive_blocks.length; iBlockInd++ )    this.inactive_blocks[ this.inactive_blocks.length ] = new BxDolPFMBlock( this, oAreaData.inactive_blocks[ iBlockInd ] );
+    for( var iItemInd  = 0; iItemInd  < oAreaData.active_items.length;    iItemInd ++ )    this.active_items[    this.active_items.length    ] = new BxDolPFMItem(  this, oAreaData.active_items[    iItemInd  ] );
+    for( var iItemInd  = 0; iItemInd  < oAreaData.inactive_items.length;  iItemInd ++ )    this.inactive_items[  this.inactive_items.length  ] = new BxDolPFMItem(  this, oAreaData.inactive_items[  iItemInd  ] );
+    this.draw();
+}
 BxDolPFMArea.prototype.draw = function() {
     $( this.element ).html( '' ); //clear element
+    $( this.element ).html( '' ); //clear element
     var sActiveItemsC = _t('_adm_mbuilder_active_items');
     var sInactiveItemsC = _t('_adm_mbuilder_inactive_items');
     var sInactiveBlocksC = _t('_adm_txt_pb_inactive_blocks');
     $( this.element ).append(
         '<div class="build_zone_header">'+sActiveItemsC+'</div>' +
         '<div class="blocks_cont_bord">' +
             '<div class="blocks_container" id="' + this.activeZoneElemID + '">' +
                 '<div class="build_block_fake"></div>' +
             '</div>' +
         '</div>' +
         '<br style="height:20px;clear:both;" />' +
         '<div class="build_zone_header">'+sInactiveBlocksC+'</div>' +
         '<div class="blocks_cont_bord">' +
             '<div class="blocks_container" id="' + this.inactiveBlocksZoneElemID + '">' +
                 '<div class="build_block_fake"></div>' +
             '</div>' +
         '</div>' +
         '<br style="height:20px;clear:both;" />' +
         '<div class="build_zone_header">'+sInactiveItemsC+'</div>' +
         '<div class="blocks_cont_bord build_block_inactive_items">' +
             '<div class="blocks_container" id="' + this.inactiveItemsZoneElemID + '">' +
                 '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_1">' +
                     '<div class="build_item_fake"></div>' +
                 '</div>' +
                 '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_2">' +
                     '<div class="build_item_fake"></div>' +
                 '</div>' +
                 '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_3">' +
                     '<div class="build_item_fake"></div>' +
                 '</div>' +
                 '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_4">' +
                     '<div class="build_item_fake"></div>' +
                 '</div>' +
                 '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_5">' +
                     '<div class="build_item_fake"></div>' +
                 '</div>' +
             '</div>' +
         '</div>'
     );
     this.activeZoneElement         = $( '#' + this.activeZoneElemID         ).get(0);
     this.inactiveBlocksZoneElement = $( '#' + this.inactiveBlocksZoneElemID ).get(0);
     this.inactiveItemsZoneElement  = $( '#' + this.inactiveItemsZoneElemID  ).get(0);
     //draw all active blocks
     for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ ) {
         this.active_blocks[iBlockInd].draw( this.activeZoneElement );
         //draw subitems of block
         for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
             if( this.active_items[iItemInd].block == this.active_blocks[iBlockInd].id )
                 this.active_items[iItemInd].draw( this.active_blocks[iBlockInd].element );
+    }
     //append NEW BLOCK element
     $( this.inactiveBlocksZoneElement ).append(
         '<div class="build_block" id="build_block_new_' + this.id + '">' +
             '<div class="build_block_header">NEW BLOCK</div>' +
         '</div>'
     );
     //append all inactive blocks
     for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
         this.inactive_blocks[iBlockInd].draw( this.inactiveBlocksZoneElement );
     //append NEW_ITEM element
     $( '#build_inac_items_area_' + this.id + '_col_1' ).append(
         '<div class="build_item_active" id="build_item_new_' + this.id + '">NEW_ITEM</div>'
     );
     //append all inactive items to 5 columns
     var iColCount = 2;
     for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ ) {
         this.inactive_items[iItemInd].draw(
             $( '#build_inac_items_area_' + this.id + '_col_' + iColCount++ ).get(0)
         );
         if( iColCount > 5 ) iColCount = 1;
+    }
     $( this.activeZoneElement         ).append( '<div class="clear_both"></div>' );
     $( this.inactiveBlocksZoneElement ).append( '<div class="clear_both"></div>' );
     $( this.inactiveItemsZoneElement  ).append( '<div class="clear_both"></div>' );
     this.fixZonesWidths();
     this.activateSortable();
+    $( this.element ).append(
+        '<div class="build_zone_header">'+sActiveItemsC+'</div>' +
+        '<div class="blocks_cont_bord">' +
+            '<div class="blocks_container" id="' + this.activeZoneElemID + '">' +
+                '<div class="build_block_fake"></div>' +
+            '</div>' +
+        '</div>' +
+        '<br style="height:20px;clear:both;" />' +
+        '<div class="build_zone_header">'+sInactiveBlocksC+'</div>' +
+        '<div class="blocks_cont_bord">' +
+            '<div class="blocks_container" id="' + this.inactiveBlocksZoneElemID + '">' +
+                '<div class="build_block_fake"></div>' +
+            '</div>' +
+        '</div>' +
+        '<br style="height:20px;clear:both;" />' +
+        '<div class="build_zone_header">'+sInactiveItemsC+'</div>' +
+        '<div class="blocks_cont_bord build_block_inactive_items">' +
+            '<div class="blocks_container" id="' + this.inactiveItemsZoneElemID + '">' +
+                '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_1">' +
+                    '<div class="build_item_fake"></div>' +
+                '</div>' +
+                '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_2">' +
+                    '<div class="build_item_fake"></div>' +
+                '</div>' +
+                '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_3">' +
+                    '<div class="build_item_fake"></div>' +
+                '</div>' +
+                '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_4">' +
+                    '<div class="build_item_fake"></div>' +
+                '</div>' +
+                '<div class="build_inac_items_col" id="build_inac_items_area_' + this.id + '_col_5">' +
+                    '<div class="build_item_fake"></div>' +
+                '</div>' +
+            '</div>' +
+        '</div>'
+    );
+    this.activeZoneElement         = $( '#' + this.activeZoneElemID         ).get(0);
+    this.inactiveBlocksZoneElement = $( '#' + this.inactiveBlocksZoneElemID ).get(0);
+    this.inactiveItemsZoneElement  = $( '#' + this.inactiveItemsZoneElemID  ).get(0);
+    //draw all active blocks
+    for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ ) {
+        this.active_blocks[iBlockInd].draw( this.activeZoneElement );
+        //draw subitems of block
+        for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
+            if( this.active_items[iItemInd].block == this.active_blocks[iBlockInd].id )
+                this.active_items[iItemInd].draw( this.active_blocks[iBlockInd].element );
+    }
+    //append NEW BLOCK element
+    $( this.inactiveBlocksZoneElement ).append(
+        '<div class="build_block" id="build_block_new_' + this.id + '">' +
+            '<div class="build_block_header">NEW BLOCK</div>' +
+        '</div>'
+    );
+    //append all inactive blocks
+    for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
+        this.inactive_blocks[iBlockInd].draw( this.inactiveBlocksZoneElement );
+    //append NEW_ITEM element
+    $( '#build_inac_items_area_' + this.id + '_col_1' ).append(
+        '<div class="build_item_active" id="build_item_new_' + this.id + '">NEW_ITEM</div>'
+    );
+    //append all inactive items to 5 columns
+    var iColCount = 2;
+    for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ ) {
+        this.inactive_items[iItemInd].draw(
+            $( '#build_inac_items_area_' + this.id + '_col_' + iColCount++ ).get(0)
+        );
+        if( iColCount > 5 ) iColCount = 1;
+    }
+    $( this.activeZoneElement         ).append( '<div class="clear_both"></div>' );
+    $( this.inactiveBlocksZoneElement ).append( '<div class="clear_both"></div>' );
+    $( this.inactiveItemsZoneElement  ).append( '<div class="clear_both"></div>' );
+    this.fixZonesWidths();
+    this.activateSortable();
+}
 BxDolPFMArea.prototype.fixZonesWidths = function() {
     if( this.active_blocks.length ) {
         //fix active area
         var el = $( this.active_blocks[0].element );
         var w1 = parseInt( el.css( 'width'        ) ) | 0;
         var w2 = parseInt( el.css( 'margin-left'  ) ) | 0;
         var w3 = parseInt( el.css( 'margin-right' ) ) | 0;
         var w = ( w1 + w2 + w3 ) * ( this.active_blocks.length + 1 ) + 20;
         $( this.activeZoneElement ).parent().width( w );
+    }
     if( this.inactive_blocks.length ) {
         //fix inactive area
         var el = $( this.inactive_blocks[0].element );
         var w1 = parseInt( el.css( 'width'        ) ) | 0;
         var w2 = parseInt( el.css( 'margin-left'  ) ) | 0;
         var w3 = parseInt( el.css( 'margin-right' ) ) | 0;
         var w = ( w1 + w2 + w3 ) * ( this.inactive_blocks.length + 2 ) + 20;
         $( this.inactiveBlocksZoneElement ).parent().width( w );
+    }
+    if( this.active_blocks.length ) {
+        //fix active area
+        var el = $( this.active_blocks[0].element );
+        var w1 = parseInt( el.css( 'width'        ) ) | 0;
+        var w2 = parseInt( el.css( 'margin-left'  ) ) | 0;
+        var w3 = parseInt( el.css( 'margin-right' ) ) | 0;
+        var w = ( w1 + w2 + w3 ) * ( this.active_blocks.length + 1 ) + 20;
+        $( this.activeZoneElement ).parent().width( w );
+    }
+    if( this.inactive_blocks.length ) {
+        //fix inactive area
+        var el = $( this.inactive_blocks[0].element );
+        var w1 = parseInt( el.css( 'width'        ) ) | 0;
+        var w2 = parseInt( el.css( 'margin-left'  ) ) | 0;
+        var w3 = parseInt( el.css( 'margin-right' ) ) | 0;
+        var w = ( w1 + w2 + w3 ) * ( this.inactive_blocks.length + 2 ) + 20;
+        $( this.inactiveBlocksZoneElement ).parent().width( w );
+    }
+}
 BxDolPFMArea.prototype.activateSortable = function() {
     var oThisArea = this;
+    var oThisArea = this;
     $('.blocks_container', this.element).sortable('destroy').sortable({
         items: $('.build_block,.build_block_fake', this.element),
 …
         placeholder: 'build_block ui-sortable-placeholder',
         forcePlaceholderSize: true,
         stop: function(e,ui){
             oThisArea.stopItemsSort( ui.item );
+        }
+        stop: function(e,ui){
+            oThisArea.stopItemsSort( ui.item );
+        }
     });
     $('.build_block,.build_inac_items_col', this.element).sortable({
         items: $('.build_item_active,.build_item_inactive,.build_item_fake', this.element),
 …
         placeholder: 'build_item_active  ui-sortable-placeholder',
         forcePlaceholderSize: true,
         stop: function(e,ui){
             oThisArea.stopItemsSort( ui.item );
+        }
+        stop: function(e,ui){
+            oThisArea.stopItemsSort( ui.item );
+        }
     });
+}
 …
 BxDolPFMArea.prototype.stopItemsSort = function( item ) {
     var draggedElementID = $(item).attr('id');
     if( draggedElementID == 'build_block_new_' + this.id ) {
         if( $( '#build_block_new_' + this.id ).parent().is( '#' + this.activeZoneElemID ) )
             this.createNewBlock();
+    }
     else if( draggedElementID == 'build_item_new_' + this.id ){
         if( $( '#build_item_new_' + this.id ).parents('#' + this.activeZoneElemID).length )
             this.createNewItem();
+    }
     else
         this.resortAndSubmit();
+    if( draggedElementID == 'build_block_new_' + this.id ) {
+        if( $( '#build_block_new_' + this.id ).parent().is( '#' + this.activeZoneElemID ) )
+            this.createNewBlock();
+    }
+    else if( draggedElementID == 'build_item_new_' + this.id ){
+        if( $( '#build_item_new_' + this.id ).parents('#' + this.activeZoneElemID).length )
+            this.createNewItem();
+    }
+    else
+        this.resortAndSubmit();
+}
 BxDolPFMArea.prototype.resortAndSubmit = function(){
     var oThisArea = this;
     setTimeout( function() {
         oThisArea.resortArrays();
         oThisArea.submitPositions();
     }, 550 );
+    var oThisArea = this;
+    setTimeout( function() {
+        oThisArea.resortArrays();
+        oThisArea.submitPositions();
+    }, 550 );
+}
 BxDolPFMArea.prototype.createNewBlock = function() {
     var oThisArea = this;
     $.getJSON(
         this.parent.config.parserUrl,
         {action: 'createNewBlock'},
         function(oAreaData){
             oThisArea.parent.updateAreas( 'newBlock', oAreaData.id, '', oThisArea.id );
+        }
     );
+    var oThisArea = this;
+    $.getJSON(
+        this.parent.config.parserUrl,
+        {action: 'createNewBlock'},
+        function(oAreaData){
+            oThisArea.parent.updateAreas( 'newBlock', oAreaData.id, '', oThisArea.id );
+        }
+    );
+}
 BxDolPFMArea.prototype.createNewItem = function() {
     var oThisArea = this;
     $.getJSON(
         this.parent.config.parserUrl,
         {action: 'createNewItem'},
         function(oAreaData){
             oThisArea.parent.updateAreas( 'newItem', oAreaData.id, '', oThisArea.id );
+        }
     );
+    var oThisArea = this;
+    $.getJSON(
+        this.parent.config.parserUrl,
+        {action: 'createNewItem'},
+        function(oAreaData){
+            oThisArea.parent.updateAreas( 'newItem', oAreaData.id, '', oThisArea.id );
+        }
+    );
+}
 BxDolPFMArea.prototype.insertNewBlock = function( newBlockID ) {
     var iNewInd = this.active_blocks.length;
     var oNewBlockData = {id:newBlockID,name:'NEW BLOCK'};
     var oThisArea = this;
     //create object
     this.active_blocks[iNewInd] = new BxDolPFMBlock( this, oNewBlockData );
     var oNewBlock = this.active_blocks[iNewInd];
     //insert before fake NEW BLOCK element
     $( oNewBlock.getCode() ).insertBefore( '#build_block_new_' + this.id );
     //attach onclick event for link
     $( '#' + oNewBlock.elementID + ' > div.build_block_header' ).children( 'a' ).click( function(){
         oThisArea.openFieldDialog( oNewBlock.id, oThisArea.id );
     } );
     //get element
     oNewBlock.getElement();
     this.activateSortable();
+    var iNewInd = this.active_blocks.length;
+    var oNewBlockData = {id:newBlockID,name:'NEW BLOCK'};
+    var oThisArea = this;
+    //create object
+    this.active_blocks[iNewInd] = new BxDolPFMBlock( this, oNewBlockData );
+    var oNewBlock = this.active_blocks[iNewInd];
+    //insert before fake NEW BLOCK element
+    $( oNewBlock.getCode() ).insertBefore( '#build_block_new_' + this.id );
+    //attach onclick event for link
+    $( '#' + oNewBlock.elementID + ' > div.build_block_header' ).children( 'a' ).click( function(){
+        oThisArea.openFieldDialog( oNewBlock.id, oThisArea.id );
+    } );
+    //get element
+    oNewBlock.getElement();
+    this.activateSortable();
+}
 BxDolPFMArea.prototype.insertNewItem = function( newItemID ) {
     var iNewInd = this.active_items.length;
     var oNewItemData = {id:newItemID,name:'NEW_ITEM'};
     var oThisArea = this;
     //create object
     this.active_items[iNewInd] = new BxDolPFMItem( this, oNewItemData );
     var oNewItem = this.active_items[iNewInd];
     //insert before fake NEW_ITEM element
     $( oNewItem.getCode() ).insertBefore( '#build_item_new_' + this.id );
     //attach onclick event for link
     $( '#' + oNewItem.elementID ).children( 'a' ).click( function(){
         oThisArea.openFieldDialog( oNewItem.id, oThisArea.id );
     } );
     //get element
     this.active_items[iNewInd].getElement();
     this.activateSortable();
+    var iNewInd = this.active_items.length;
+    var oNewItemData = {id:newItemID,name:'NEW_ITEM'};
+    var oThisArea = this;
+    //create object
+    this.active_items[iNewInd] = new BxDolPFMItem( this, oNewItemData );
+    var oNewItem = this.active_items[iNewInd];
+    //insert before fake NEW_ITEM element
+    $( oNewItem.getCode() ).insertBefore( '#build_item_new_' + this.id );
+    //attach onclick event for link
+    $( '#' + oNewItem.elementID ).children( 'a' ).click( function(){
+        oThisArea.openFieldDialog( oNewItem.id, oThisArea.id );
+    } );
+    //get element
+    this.active_items[iNewInd].getElement();
+    this.activateSortable();
+}
 BxDolPFMArea.prototype.moveFakeBlockBack = function() {
     $( '#build_block_new_' + this.id ).prependTo( this.inactiveBlocksZoneElement );
+    $( '#build_block_new_' + this.id ).prependTo( this.inactiveBlocksZoneElement );
+}
 BxDolPFMArea.prototype.moveFakeItemBack = function() {
     $( '#build_item_new_' + this.id ).prependTo( '#build_inac_items_area_' + this.id + '_col_1' );
+    $( '#build_item_new_' + this.id ).prependTo( '#build_inac_items_area_' + this.id + '_col_1' );
+}
 BxDolPFMArea.prototype.resortArrays = function() {
     var oThisArea = this;
     var aNewBlocks     = new Array();
     var aNewBlocksInac = new Array();
     var aNewItems      = new Array();
     var aNewItemsInac  = new Array();
     //get active blocks
     $( '#' + this.activeZoneElemID + ' .build_block' ).each( function( ind, eBlock ){
         var oBlock = oThisArea.getBlockByElementID( eBlock.id );
         if( !oBlock || $( eBlock ).css('visibility') == 'hidden' ) return; //just in case
         aNewBlocks.push( oBlock );
         //get active items of this block
         $( '#' + oBlock.elementID + ' .build_item_active' ).each( function( ind, eItem ){
             var oItem = oThisArea.getItemByElementID( eItem.id );
             if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return; //it can be fake NEW_ITEM
             oItem.block = oBlock.id; //set parent block
             aNewItems.push( oItem );
         });
     });
     //get inactive blocks
     $( '#' + this.inactiveBlocksZoneElemID + ' .build_block' ).each( function( ind, eBlock ){
         var oBlock = oThisArea.getBlockByElementID( eBlock.id );
         if( !oBlock || $( eBlock ).css('visibility') == 'hidden' ) return;
         aNewBlocksInac.push( oBlock );
     });
     //get inactive items from blocks zone
     $( '#' + this.inactiveBlocksZoneElemID + ' .build_item_active' ).each( function( ind, eItem ){
         var oItem = oThisArea.getItemByElementID( eItem.id );
         if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return;
         oItem.block = 0;
         aNewItemsInac.push( oItem );
     });
     //get inactive items from items zone
     $( '#' + this.inactiveItemsZoneElemID + ' .build_item_active' ).each( function( ind, eItem ){
         var oItem = oThisArea.getItemByElementID( eItem.id );
         if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return;
         oItem.block = 0;
         aNewItemsInac.push( oItem );
     });
     this.active_blocks   = aNewBlocks;
     this.inactive_blocks = aNewBlocksInac;
     this.active_items    = aNewItems;
     this.inactive_items  = aNewItemsInac;
     this.fixZonesWidths();
+    var oThisArea = this;
+    var aNewBlocks     = new Array();
+    var aNewBlocksInac = new Array();
+    var aNewItems      = new Array();
+    var aNewItemsInac  = new Array();
+    //get active blocks
+    $( '#' + this.activeZoneElemID + ' .build_block' ).each( function( ind, eBlock ){
+        var oBlock = oThisArea.getBlockByElementID( eBlock.id );
+        if( !oBlock || $( eBlock ).css('visibility') == 'hidden' ) return; //just in case
+        aNewBlocks.push( oBlock );
+        //get active items of this block
+        $( '#' + oBlock.elementID + ' .build_item_active' ).each( function( ind, eItem ){
+            var oItem = oThisArea.getItemByElementID( eItem.id );
+            if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return; //it can be fake NEW_ITEM
+            oItem.block = oBlock.id; //set parent block
+            aNewItems.push( oItem );
+        });
+    });
+    //get inactive blocks
+    $( '#' + this.inactiveBlocksZoneElemID + ' .build_block' ).each( function( ind, eBlock ){
+        var oBlock = oThisArea.getBlockByElementID( eBlock.id );
+        if( !oBlock || $( eBlock ).css('visibility') == 'hidden' ) return;
+        aNewBlocksInac.push( oBlock );
+    });
+    //get inactive items from blocks zone
+    $( '#' + this.inactiveBlocksZoneElemID + ' .build_item_active' ).each( function( ind, eItem ){
+        var oItem = oThisArea.getItemByElementID( eItem.id );
+        if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return;
+        oItem.block = 0;
+        aNewItemsInac.push( oItem );
+    });
+    //get inactive items from items zone
+    $( '#' + this.inactiveItemsZoneElemID + ' .build_item_active' ).each( function( ind, eItem ){
+        var oItem = oThisArea.getItemByElementID( eItem.id );
+        if( !oItem || $( eItem ).css('visibility') == 'hidden' ) return;
+        oItem.block = 0;
+        aNewItemsInac.push( oItem );
+    });
+    this.active_blocks   = aNewBlocks;
+    this.inactive_blocks = aNewBlocksInac;
+    this.active_items    = aNewItems;
+    this.inactive_items  = aNewItemsInac;
+    this.fixZonesWidths();
+}
 BxDolPFMArea.prototype.submitPositions = function(){
     var oRequest = {};
     for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ ) {
         oRequest['blocks[' + iBlockInd + ']'] = this.active_blocks[iBlockInd].id;
+    }
     for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ ) {
         oRequest['items[' + iItemInd + ']'] = this.active_items[iItemInd].id;
         oRequest['items_blocks[' + this.active_items[iItemInd].id + ']'] = this.active_items[iItemInd].block;
+    }
     oRequest.action = 'savePositions';
     oRequest.id = this.id;
     var oThisArea = this;
     $.post( this.parent.config.parserUrl, oRequest, function(sResult){oThisArea.processSaveResult(sResult);} );
+    var oRequest = {};
+    for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ ) {
+        oRequest['blocks[' + iBlockInd + ']'] = this.active_blocks[iBlockInd].id;
+    }
+    for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ ) {
+        oRequest['items[' + iItemInd + ']'] = this.active_items[iItemInd].id;
+        oRequest['items_blocks[' + this.active_items[iItemInd].id + ']'] = this.active_items[iItemInd].block;
+    }
+    oRequest.action = 'savePositions';
+    oRequest.id = this.id;
+    var oThisArea = this;
+    $.post( this.parent.config.parserUrl, oRequest, function(sResult){oThisArea.processSaveResult(sResult);} );
+}
 BxDolPFMArea.prototype.processSaveResult = function( sResult ) {
     if( $.trim( sResult ) != 'OK' )
         alert( sResult );
+    if( $.trim( sResult ) != 'OK' )
+        alert( sResult );
+}
 BxDolPFMArea.prototype.getBlockByElementID = function( getID ) {
     for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ )
         if( this.active_blocks[iBlockInd].elementID == getID )
             return this.active_blocks[iBlockInd];
     for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
         if( this.inactive_blocks[iBlockInd].elementID == getID )
             return this.inactive_blocks[iBlockInd];
     return false;
+    for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ )
+        if( this.active_blocks[iBlockInd].elementID == getID )
+            return this.active_blocks[iBlockInd];
+    for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
+        if( this.inactive_blocks[iBlockInd].elementID == getID )
+            return this.inactive_blocks[iBlockInd];
+    return false;
+}
 BxDolPFMArea.prototype.getItemByElementID = function( getID ) {
     for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
         if( this.active_items[iItemInd].elementID == getID )
             return this.active_items[iItemInd];
     for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ )
         if( this.inactive_items[iItemInd].elementID == getID )
             return this.inactive_items[iItemInd];
     return false;
+    for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
+        if( this.active_items[iItemInd].elementID == getID )
+            return this.active_items[iItemInd];
+    for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ )
+        if( this.inactive_items[iItemInd].elementID == getID )
+            return this.inactive_items[iItemInd];
+    return false;
+}
 BxDolPFMArea.prototype.getItemOrBlockByID = function( getID ) {
     //search in active items
     for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
         if( this.active_items[iItemInd].id == getID )
             return this.active_items[iItemInd];
     //search in inactive items
     for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ )
         if( this.inactive_items[iItemInd].id == getID )
             return this.inactive_items[iItemInd];
     //search in active blocks
     for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ )
         if( this.active_blocks[iBlockInd].id == getID )
             return this.active_blocks[iBlockInd];
     //search in inactive blocks
     for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
         if( this.inactive_blocks[iBlockInd].id == getID )
             return this.inactive_blocks[iBlockInd];
     return false;
+    //search in active items
+    for( var iItemInd = 0; iItemInd < this.active_items.length; iItemInd ++ )
+        if( this.active_items[iItemInd].id == getID )
+            return this.active_items[iItemInd];
+    //search in inactive items
+    for( var iItemInd = 0; iItemInd < this.inactive_items.length; iItemInd ++ )
+        if( this.inactive_items[iItemInd].id == getID )
+            return this.inactive_items[iItemInd];
+    //search in active blocks
+    for( var iBlockInd = 0; iBlockInd < this.active_blocks.length; iBlockInd ++ )
+        if( this.active_blocks[iBlockInd].id == getID )
+            return this.active_blocks[iBlockInd];
+    //search in inactive blocks
+    for( var iBlockInd = 0; iBlockInd < this.inactive_blocks.length; iBlockInd ++ )
+        if( this.inactive_blocks[iBlockInd].id == getID )
+            return this.inactive_blocks[iBlockInd];
+    return false;
+}
 BxDolPFMArea.prototype.openFieldDialog = function( iItemID, iAreaID ) {
     $( '#fieldFormWrap' ).css({
         width: ( document.body.clientWidth + 30 ),
         height: ( ( window.innerHeight ? window.innerHeight : screen.height) + 30 ),
         left: ( this.getHorizScroll() - 30 ),
         top: ( this.getVertScroll() - 30 ),
         display: 'block'
+    });
     getHtmlData( 'edit_form_cont', this.parent.config.parserUrl + '?action=loadEditForm&id=' + iItemID + '&area=' + iAreaID, function (){
+    $( '#fieldFormWrap' ).css({
+        width: ( document.body.clientWidth + 30 ),
+        height: ( ( window.innerHeight ? window.innerHeight : screen.height) + 30 ),
+        left: ( this.getHorizScroll() - 30 ),
+        top: ( this.getVertScroll() - 30 ),
+        display: 'block'
+    });
+    getHtmlData( 'edit_form_cont', this.parent.config.parserUrl + '?action=loadEditForm&id=' + iItemID + '&area=' + iAreaID, function (){
         $('#edit_form_cont > div').dolPopup({
             fog: {
                 color: '#fff',
+                color: '#fff',
                 opacity: .7
             },
             closeOnOuterClick: false
         });
     });
+    });
+}
 BxDolPFMArea.prototype.getHorizScroll = function() {
     return (navigator.appName == "Microsoft Internet Explorer") ? document.documentElement.scrollLeft : window.pageXOffset;
+    return (navigator.appName == "Microsoft Internet Explorer") ? document.documentElement.scrollLeft : window.pageXOffset;
+}
 BxDolPFMArea.prototype.getVertScroll = function() {
     return (navigator.appName == "Microsoft Internet Explorer") ? document.documentElement.scrollTop : window.pageYOffset;
+    return (navigator.appName == "Microsoft Internet Explorer") ? document.documentElement.scrollTop : window.pageYOffset;
+}
 …
 function BxDolPFMBlock( parent, oBlockData ) {
     this.id        = oBlockData.id;
     this.parent    = parent;
     this.name      = oBlockData.name;
     this.elementID = 'build_block_' + this.parent.id + '_' + this.id;
+    this.id        = oBlockData.id;
+    this.parent    = parent;
+    this.name      = oBlockData.name;
+    this.elementID = 'build_block_' + this.parent.id + '_' + this.id;
+}
 BxDolPFMBlock.prototype.draw = function( oParentElement ) {
     var oThisBlock = this;
     $( oParentElement ).append( this.getCode() );
     $( '#' + this.elementID + ' > div.build_block_header' ).children( 'a' ).click( function(){
         oThisBlock.parent.openFieldDialog( oThisBlock.id, oThisBlock.parent.id );
     } );
     this.getElement();
+    var oThisBlock = this;
+    $( oParentElement ).append( this.getCode() );
+    $( '#' + this.elementID + ' > div.build_block_header' ).children( 'a' ).click( function(){
+        oThisBlock.parent.openFieldDialog( oThisBlock.id, oThisBlock.parent.id );
+    } );
+    this.getElement();
+}
 BxDolPFMBlock.prototype.getCode = function() {
     return '<div class="build_block" id="' + this.elementID + '">' +
             '<div class="build_block_header">' +
                 '<a href="javascript:void(0)">' +
                     this.name +
                 '</a>' +
             '</div>' +
             '<div class="build_item_fake"></div>' +
         '</div>';
+    return '<div class="build_block" id="' + this.elementID + '">' +
+            '<div class="build_block_header">' +
+                '<a href="javascript:void(0)">' +
+                    this.name +
+                '</a>' +
+            '</div>' +
+            '<div class="build_item_fake"></div>' +
+        '</div>';
+}
 BxDolPFMBlock.prototype.getElement = function() {
     this.element = $( '#' + this.elementID ).get(0);
+    this.element = $( '#' + this.elementID ).get(0);
+}
 BxDolPFMBlock.prototype.updateName = function( sNewName ) {
     $( this.element ).children( 'div.build_block_header' ).children( 'a' ).html( sNewName );
+    $( this.element ).children( 'div.build_block_header' ).children( 'a' ).html( sNewName );
+}
 …
 function BxDolPFMItem( parent, oItemData ) {
     this.id        = oItemData.id;
     this.parent    = parent;
     this.name      = oItemData.name;
     this.block     = oItemData.block;
     this.elementID = 'build_item_' + this.parent.id + '_' + this.id;
+    this.id        = oItemData.id;
+    this.parent    = parent;
+    this.name      = oItemData.name;
+    this.block     = oItemData.block;
+    this.elementID = 'build_item_' + this.parent.id + '_' + this.id;
+}
 BxDolPFMItem.prototype.draw = function( oParentElement ) {
     var oThisItem = this;
     $( oParentElement ).append( this.getCode() );
     $( '#' + this.elementID ).children( 'a' ).click( function(){
         oThisItem.parent.openFieldDialog( oThisItem.id, oThisItem.parent.id );
     } );
     this.getElement();
+    var oThisItem = this;
+    $( oParentElement ).append( this.getCode() );
+    $( '#' + this.elementID ).children( 'a' ).click( function(){
+        oThisItem.parent.openFieldDialog( oThisItem.id, oThisItem.parent.id );
+    } );
+    this.getElement();
+}
 BxDolPFMItem.prototype.getCode = function( oParentElement ) {
     return '<div class="build_item_active" id="' + this.elementID + '">' +
         '<a href="javascript:void(0)">' +
             this.name +
         '</a>' +
     '</div>';
+    return '<div class="build_item_active" id="' + this.elementID + '">' +
+        '<a href="javascript:void(0)">' +
+            this.name +
+        '</a>' +
+    '</div>';
+}
 BxDolPFMItem.prototype.getElement = function() {
     this.element = $( '#' + this.elementID ).get(0);
+    this.element = $( '#' + this.elementID ).get(0);
+}
 BxDolPFMItem.prototype.updateName = function( sNewName ) {
     $( this.element ).children( 'a' ).html( sNewName );
+    $( this.element ).children( 'a' ).html( sNewName );
+}
 …
 function hideEditForm() {
     $('#edit_form_cont > div').dolPopupHide();
+    $('#edit_form_cont > div').dolPopupHide();
+}
 function changeFieldType( _type ) {
     var aShow = new Array();
+    var aHide = new Array();
     switch( _type ) {
         case 'text':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_default' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_lkey' );
         break;
         case 'area':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_default', 'field_lkey' );
         break;
         case 'pass':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_default', 'field_lkey' );
         break;
         case 'date':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg', 'field_default' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_lkey' );
         break;
         case 'select_one':
             aShow = new Array( 'field_control_select_one', 'field_values', 'field_default', 'field_lkey' );
             aHide = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_control_select_set', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
         break;
         case 'select_set':
             aShow = new Array( 'field_control_select_set', 'field_values', 'field_lkey' );
             aHide = new Array( 'field_minimum', 'field_maximum', 'field_control_select_one', 'field_default', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
         break;
         case 'num':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_default' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_lkey' );
         break;
         case 'range':
             aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg', 'field_default' );
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_lkey' );
         break;
         case 'bool':
             aShow = new Array( 'field_default');
             aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_values', 'field_lkey' );
         break;
+    }
     for( var iInd = 0; iInd < aHide.length; iInd ++ )
         $( '#' + aHide[iInd] ).css( {display: 'none'} );
     for( var iInd = 0; iInd < aShow.length; iInd ++ )
         $( '#' + aShow[iInd] ).css( {display: ''} );
+    var aShow = new Array();
+    var aHide = new Array();
+    switch( _type ) {
+        case 'text':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_default' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_lkey' );
+        break;
+        case 'area':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_default', 'field_lkey' );
+        break;
+        case 'pass':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_default', 'field_lkey' );
+        break;
+        case 'date':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg', 'field_default' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_lkey' );
+        break;
+        case 'select_one':
+            aShow = new Array( 'field_control_select_one', 'field_values', 'field_default', 'field_lkey' );
+            aHide = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_control_select_set', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
+        break;
+        case 'select_set':
+            aShow = new Array( 'field_control_select_set', 'field_values', 'field_lkey' );
+            aHide = new Array( 'field_minimum', 'field_maximum', 'field_control_select_one', 'field_default', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg' );
+        break;
+        case 'num':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_unique', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_default' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_values', 'field_lkey' );
+        break;
+        case 'range':
+            aShow = new Array( 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_check_msg', 'field_default' );
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_unique_msg', 'field_values', 'field_lkey' );
+        break;
+        case 'bool':
+            aShow = new Array( 'field_default');
+            aHide = new Array( 'field_control_select_one', 'field_control_select_set', 'field_unique', 'field_minimum', 'field_maximum', 'field_check', 'field_minimum_msg', 'field_maximum_msg', 'field_unique_msg', 'field_check_msg', 'field_values', 'field_lkey' );
+        break;
+    }
+    for( var iInd = 0; iInd < aHide.length; iInd ++ )
+        $( '#' + aHide[iInd] ).css( {display: 'none'} );
+    for( var iInd = 0; iInd < aShow.length; iInd ++ )
+        $( '#' + aShow[iInd] ).css( {display: ''} );
+}
 function activateValuesEdit( eLink ) {
     $( eLink ).parent().html( '<textarea class="input_text" name="' +
         $( eLink ).siblings( 'input' ).attr( 'name' ) +
         '">' +
         $( eLink ).siblings( 'input' ).val() +
         '</textarea>'
     );
+    $( eLink ).parent().html( '<textarea class="input_text" name="' +
+        $( eLink ).siblings( 'input' ).attr( 'name' ) +
+        '">' +
+        $( eLink ).siblings( 'input' ).val() +
+        '</textarea>'
+    );
+}
 function clearFormErrors( eForm ) {
     $( 'td.warned', eForm ).removeClass( 'warned' ).next( 'td' ).children( 'img.depr_icon' ).remove();
+    $( 'td.warned', eForm ).removeClass( 'warned' ).next( 'td' ).children( 'img.depr_icon' ).remove();
+}
 function genEditFormError( sField, sText ) {
     if( document.forms.fieldEditForm[sField] ) {
         $( document.forms.fieldEditForm[sField] ).parent( 'td' ).next( 'td' ).prepend(
+            '<img src="../templates/base/images/icons/depr.gif" class="depr_icon" ' +
             'onmouseover="showFloatDesc(\'' + processFloatDescInput( sText ) + '\')" ' +
             'onmousemove="moveFloatDesc( event )" ' +
             'onmouseout="hideFloatDesc()" ' +
             ' />'
         );
+    }
+    if( document.forms.fieldEditForm[sField] ) {
+        $( document.forms.fieldEditForm[sField] ).parent( 'td' ).next( 'td' ).prepend(
+            '<img src="../templates/base/images/icons/depr.gif" class="depr_icon" ' +
+            'onmouseover="showFloatDesc(\'' + processFloatDescInput( sText ) + '\')" ' +
+            'onmousemove="moveFloatDesc( event )" ' +
+            'onmouseout="hideFloatDesc()" ' +
+            ' />'
+        );
+    }
+}
 function updateBuilder( sText, iItemID, sNewName ) {
     oPFM.updateAreas( sText, iItemID, sNewName );
+    oPFM.updateAreas( sText, iItemID, sNewName );
+}
 function processFloatDescInput( sText ) {
     sText = sText.replace( /&/g, '&amp;' );
     sText = sText.replace( /</g, '&lt;' );
     sText = sText.replace( />/g, '&gt;' );
     sText = sText.replace( /"/g, '&quot;' );
     sText = sText.replace( /\\/g, '\\\\' );
     sText = sText.replace( /'/g, '\\\'' );
     return sText;
+}
+    sText = sText.replace( /&/g, '&amp;' );
+    sText = sText.replace( /</g, '&lt;' );
+    sText = sText.replace( />/g, '&gt;' );
+    sText = sText.replace( /"/g, '&quot;' );
+    sText = sText.replace( /\\/g, '\\\\' );
+    sText = sText.replace( /'/g, '\\\'' );
+    return sText;
+}

trunk/administration/js/functions.admin.js

r15201	r15211
1	1
2		function adminMenuCollapse(oImage) {
	2	function adminMenuCollapse(oImage) {
3	3	if($(oImage).parents('.adm-menu-header').hasClass('adm-mmh-opened'))
4	4	$(oImage).removeClass('adm-mma-opened').parents('.adm-menu-header').removeClass('adm-mmh-opened').siblings('.adm-menu-items-wrapper').removeClass('adm-mmi-opened');

trunk/administration/js/lang_file.js

-                      r15201
+                      r15211
     var sFilter = 'filter';
     var sUrl = ('' + document.location).replace(/[&]{0,1}filter=.*/, '');
     var bChecked = oCheckbox.checked == undefined ? oCheckbox.attr('checked') : oCheckbox.checked;
+    var bChecked = oCheckbox.checked == undefined ? oCheckbox.attr('checked') : oCheckbox.checked;
     if(bChecked && $('#adm-langs-look-for').val().length > 2)
         sUrl += (sUrl.indexOf('?') == -1 ? '?' : '&') + 'filter=' + $('#adm-langs-look-for').val();
 …
     $('#adm-langs-add-key').dolPopup({
         fog: {
             color: '#fff',
+            color: '#fff',
             opacity: .7
+        }
     });
+    });
+}
 function onResult(sType, oResult) {
     var sContentKey = '#adm-langs-' + sType + '-key-content';
     if(parseInt(oResult.code) == 0) {
         parent.document.forms['adm-langs-' + sType + '-key-form'].reset();
 …
             $('#adm-langs-holder > #adm-langs-edit-key').dolPopup({
                 fog: {
                     color: '#fff',
+                    color: '#fff',
                     opacity: .7
+                }
 …
     var sType = $(oLink).attr('id').replace('adm-langs-btn-', '');
     var sName = '#adm-langs-cnt-' + sType;
     $(oLink).parent('.notActive').hide().siblings('.notActive:hidden').show().siblings('.active').hide().siblings('#' + $(oLink).attr('id') + '-act').show();
     $(sName).siblings('div:visible').bx_anim('hide', 'fade', 'slow', function(){
 …
             $('#adm-langs-holder > #adm-langs-wnd-edit').dolPopup({
                 fog: {
                     color: '#fff',
+                    color: '#fff',
                     opacity: .7
+                }

trunk/administration/js/memb_levels.js

-                      r15201
+                      r15211
             $('#adm-mlevels-holder > #adm-mlevels-action').dolPopup({
                 fog: {
                     color: '#fff',
+                    color: '#fff',
                     opacity: .7
                 },
 …
             $(document).addWebForms();
             $("input[type='datetime']", document).each(function() {
                 $(this).dynDateTime({
                     ifFormat: '%Y-%m-%d %H:%M:%S',
+                $(this).dynDateTime({
+                    ifFormat: '%Y-%m-%d %H:%M:%S',
                     showsTime: true,
                     position_css: 'fixed'

trunk/administration/js/menu_compose.js

-                      r15201
+                      r15211
 function initMenu( e )
+{
     if( typeof( sNewItemTitle ) == 'undefined' )
         sNewItemTitle = 'NEW ITEM';
     oMenu = new BxDolMenu( topParentID, parserUrl, aTopItems, aCustomItems, aSystemItems, aAllItems, aCoords, e )
+    if( typeof( sNewItemTitle ) == 'undefined' )
+        sNewItemTitle = 'NEW ITEM';
+    oMenu = new BxDolMenu( topParentID, parserUrl, aTopItems, aCustomItems, aSystemItems, aAllItems, aCoords, e )
+}
 function createNewItem( type, source ) {
     var aParams = {
         action: 'create_item',
         type: type,
         source: source ? source : 0
     };
     var iNewID = 0;
     $.ajax({
         type: 'POST',
         url: parserUrl + '?r=' + Math.random(),
         data: aParams,
         success: function(sData) {
             iNewID = parseInt(sData);
         },
         dataType: 'text',
         async: false
     });
     return iNewID;
+    var aParams = {
+        action: 'create_item',
+        type: type,
+        source: source ? source : 0
+    };
+    var iNewID = 0;
+    $.ajax({
+        type: 'POST',
+        url: parserUrl + '?r=' + Math.random(),
+        data: aParams,
+        success: function(sData) {
+            iNewID = parseInt(sData);
+        },
+        dataType: 'text',
+        async: false
+    });
+    return iNewID;
+}
 …
 function deactivateItem( id )
+{
     var objXmlHttp = createXmlHttpObj();
     if( !objXmlHttp )
         return false;
     var url = parserUrl + '&action=deactivate_item&id=' + id;
     url += '&r=' + Math.random();
     objXmlHttp.open( "GET", url );
     objXmlHttp.onreadystatechange = function()
+    {
         if ( objXmlHttp.readyState == 4 && objXmlHttp.status == 200 )
+        {
             //alert( objXmlHttp.responseText );
+        }
+    }
     objXmlHttp.send( null );
+    var objXmlHttp = createXmlHttpObj();
+    if( !objXmlHttp )
+        return false;
+    var url = parserUrl + '&action=deactivate_item&id=' + id;
+    url += '&r=' + Math.random();
+    objXmlHttp.open( "GET", url );
+    objXmlHttp.onreadystatechange = function()
+    {
+        if ( objXmlHttp.readyState == 4 && objXmlHttp.status == 200 )
+        {
+            //alert( objXmlHttp.responseText );
+        }
+    }
+    objXmlHttp.send( null );
+}
 function showItemEditForm( id ) {
     getHtmlData( 'edit_form_cont', parserUrl + '&action=edit_form&id=' + id, function (){
+    getHtmlData( 'edit_form_cont', parserUrl + '&action=edit_form&id=' + id, function (){
         $('#edit_form_cont > div').dolPopup({
             fog: { color: '#fff', opacity: .7 }
         });
     });
+    });
+}
 function getHorizScroll()
+{
     if (navigator.appName == "Microsoft Internet Explorer")
         return document.documentElement.scrollLeft;
     else
         return window.pageXOffset;
+    if (navigator.appName == "Microsoft Internet Explorer")
+        return document.documentElement.scrollLeft;
+    else
+        return window.pageXOffset;
+}
 function getVertScroll()
+{
     if (navigator.appName == "Microsoft Internet Explorer")
         return document.documentElement.scrollTop;
     else
         return window.pageYOffset;
+    if (navigator.appName == "Microsoft Internet Explorer")
+        return document.documentElement.scrollTop;
+    else
+        return window.pageYOffset;
+}
 function saveItem( id )
 …
     $('#formItemEditLoading').bx_loading();
     _form = document.forms.formItemEdit;
     if( !_form )
         return false;
     /*if( _form.Caption )
+    {
         if( !_form.Caption.value.length )
+        {
             alert( 'Please enter Language Key' );
             _form.Caption.focus();
             return false;
+        }
+    }
     if( _form.LangCaption )
+    {
         if( !_form.LangCaption.value.length )
+        {
             alert( 'Please enter Default Name' );
             _form.LangCaption.focus();
             return false;
+        }
     }*/
     var oRequest = {};
     for( ind = 0; ind < _form.elements.length; ind ++ )
+    {
         var _el = _form.elements[ind];
         switch( _el.type )
+        {
             case 'text':
             case 'textarea':
             case 'select-one':
                 oRequest[_el.name] = _el.value;
+        }
+    }
     if( _form.Target )
+    {
         for( i = 0; i < _form.Target.length; i++ )
             if( _form.Target[i].checked )
                 sTarget = _form.Target[i].value;
+    }
     else
         sTarget = '';
     var sVisible_non  = ($(_form).find("[name='Visible[]'][value='non']").attr('checked') ? '1' : '0' );
     var sVisible_memb = ($(_form).find("[name='Visible[]'][value='memb']").attr('checked') ? '1' : '0' );
     var sBInQuickLink = ( ( _form.BInQuickLink && _form.BInQuickLink.checked ) ? '1' : '0' );
+    _form = document.forms.formItemEdit;
+    if( !_form )
+        return false;
+    /*if( _form.Caption )
+    {
+        if( !_form.Caption.value.length )
+        {
+            alert( 'Please enter Language Key' );
+            _form.Caption.focus();
+            return false;
+        }
+    }
+    if( _form.LangCaption )
+    {
+        if( !_form.LangCaption.value.length )
+        {
+            alert( 'Please enter Default Name' );
+            _form.LangCaption.focus();
+            return false;
+        }
+    }*/
+    var oRequest = {};
+    for( ind = 0; ind < _form.elements.length; ind ++ )
+    {
+        var _el = _form.elements[ind];
+        switch( _el.type )
+        {
+            case 'text':
+            case 'textarea':
+            case 'select-one':
+                oRequest[_el.name] = _el.value;
+        }
+    }
+    if( _form.Target )
+    {
+        for( i = 0; i < _form.Target.length; i++ )
+            if( _form.Target[i].checked )
+                sTarget = _form.Target[i].value;
+    }
+    else
+        sTarget = '';
+    var sVisible_non  = ($(_form).find("[name='Visible[]'][value='non']").attr('checked') ? '1' : '0' );
+    var sVisible_memb = ($(_form).find("[name='Visible[]'][value='memb']").attr('checked') ? '1' : '0' );
+    var sBInQuickLink = ( ( _form.BInQuickLink && _form.BInQuickLink.checked ) ? '1' : '0' );
     oRequest['action'] = 'save_item';
 …
     oRequest['BInQuickLink'] = sBInQuickLink;
     oRequest['_r'] = Math.random();
     $.post(parserUrl, oRequest, function(oData){
         $('#formItemEditLoading').bx_loading();
 …
 function saveItemByPost( id )
+{
     _form = document.forms.formItemEdit;
     var oXMLHttpReq = createXmlHttpObj();
     var elemCont = document.getElementById( 'edit_form_cont' );
     if( !_form )
         return false;
     if( !oXMLHttpReq )
         return false;
     if( !elemCont )
         return false;
     if( _form.Caption )
+    {
         if( !_form.Caption.value.length )
+        {
             alert( 'Please enter Language Key' );
             _form.Caption.focus();
             return false;
+        }
+    }
     if( _form.LangCaption )
+    {
         if( !_form.LangCaption.value.length )
+        {
             alert( 'Please enter Default Name' );
             _form.LangCaption.focus();
             return false;
+        }
+    }
     var sRequest = '';
     for( ind = 0; ind < _form.elements.length; ind ++ )
+    {
         var _el = _form.elements[ind];
         switch( _el.type )
+        {
             case 'text':
             case 'textarea':
             case 'select-one':
                 sRequest += '&' + _el.name + '=' + encodeURIComponent( _el.value );
+        }
+    }
     if( _form.Target )
+    {
         for( i = 0; i < _form.Target.length; i++ )
             if( _form.Target[i].checked )
                 sTarget = _form.Target[i].value;
+    }
     else
         sTarget = '';
     var sVisible_non  = ( ( _form.Visible_non  && _form.Visible_non.checked  ) ? '1' : '0' );
     var sVisible_memb = ( ( _form.Visible_memb && _form.Visible_memb.checked ) ? '1' : '0' );
     var sBInQuickLink = ( ( _form.BInQuickLink && _form.BInQuickLink.checked ) ? '1' : '0' );
     var sRequestUrl = 'action=save_item&id=' + id + sRequest +
         '&Target=' + sTarget +
         '&Visible_non=' + sVisible_non +
         '&Visible_memb=' + sVisible_memb +
         '&BInQuickLink=' + sBInQuickLink;
     elemCont.innerHTML = '<div class="loading"><img src="'+urlIconLoading+'"></div>';
     oXMLHttpReq.open("POST", parserUrl + '&r=' + Math.random() );
     oXMLHttpReq.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    oXMLHttpReq.onreadystatechange = function()
+    {
         if (oXMLHttpReq.readyState == 4 && oXMLHttpReq.status == 200) {
             sNewText = oXMLHttpReq.responseText;
             elemCont.innerHTML = sNewText;
             // parse javascripts and run them
             aScrMatches = sNewText.match(/<script[^>]*javascript[^>]*>([^<]*)<\/script>/ig);
             if( aScrMatches )
+            {
                 for( ind = 0; ind < aScrMatches.length; ind ++ )
+                {
                     sScr = aScrMatches[ind];
                     iOffset = sScr.match(/<script[^>]*javascript[^>]*>/i)[0].length;
                     sScript = sScr.substring( iOffset, sScr.length - 9 );
                     eval( sScript );
+                }
+            }
+        }
+    }
     oXMLHttpReq.send( sRequestUrl );
+    _form = document.forms.formItemEdit;
+    var oXMLHttpReq = createXmlHttpObj();
+    var elemCont = document.getElementById( 'edit_form_cont' );
+    if( !_form )
+        return false;
+    if( !oXMLHttpReq )
+        return false;
+    if( !elemCont )
+        return false;
+    if( _form.Caption )
+    {
+        if( !_form.Caption.value.length )
+        {
+            alert( 'Please enter Language Key' );
+            _form.Caption.focus();
+            return false;
+        }
+    }
+    if( _form.LangCaption )
+    {
+        if( !_form.LangCaption.value.length )
+        {
+            alert( 'Please enter Default Name' );
+            _form.LangCaption.focus();
+            return false;
+        }
+    }
+    var sRequest = '';
+    for( ind = 0; ind < _form.elements.length; ind ++ )
+    {
+        var _el = _form.elements[ind];
+        switch( _el.type )
+        {
+            case 'text':
+            case 'textarea':
+            case 'select-one':
+                sRequest += '&' + _el.name + '=' + encodeURIComponent( _el.value );
+        }
+    }
+    if( _form.Target )
+    {
+        for( i = 0; i < _form.Target.length; i++ )
+            if( _form.Target[i].checked )
+                sTarget = _form.Target[i].value;
+    }
+    else
+        sTarget = '';
+    var sVisible_non  = ( ( _form.Visible_non  && _form.Visible_non.checked  ) ? '1' : '0' );
+    var sVisible_memb = ( ( _form.Visible_memb && _form.Visible_memb.checked ) ? '1' : '0' );
+    var sBInQuickLink = ( ( _form.BInQuickLink && _form.BInQuickLink.checked ) ? '1' : '0' );
+    var sRequestUrl = 'action=save_item&id=' + id + sRequest +
+        '&Target=' + sTarget +
+        '&Visible_non=' + sVisible_non +
+        '&Visible_memb=' + sVisible_memb +
+        '&BInQuickLink=' + sBInQuickLink;
+    elemCont.innerHTML = '<div class="loading"><img src="'+urlIconLoading+'"></div>';
+    oXMLHttpReq.open("POST", parserUrl + '&r=' + Math.random() );
+    oXMLHttpReq.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    oXMLHttpReq.onreadystatechange = function()
+    {
+        if (oXMLHttpReq.readyState == 4 && oXMLHttpReq.status == 200) {
+            sNewText = oXMLHttpReq.responseText;
+            elemCont.innerHTML = sNewText;
+            // parse javascripts and run them
+            aScrMatches = sNewText.match(/<script[^>]*javascript[^>]*>([^<]*)<\/script>/ig);
+            if( aScrMatches )
+            {
+                for( ind = 0; ind < aScrMatches.length; ind ++ )
+                {
+                    sScr = aScrMatches[ind];
+                    iOffset = sScr.match(/<script[^>]*javascript[^>]*>/i)[0].length;
+                    sScript = sScr.substring( iOffset, sScr.length - 9 );
+                    eval( sScript );
+                }
+            }
+        }
+    }
+    oXMLHttpReq.send( sRequestUrl );
+}
 function updateItem( id, title )
+{
     oMenu.updateItem( id, title );
+    oMenu.updateItem( id, title );
+}
 function deleteItem( id ) {
     if(confirm('Are you sure want delete this item?')){
         var aParams = {
             action: 'delete_item',
             id: id
         };
         $.post(
             parserUrl + '?r=' + Math.random(),
             aParams,
             function(sData) {
                 if(sData == 'OK')
                     location.reload();
                 else
                     alert(sData);
             },
             'text'
         );
         return true;
+    }
     else
         return false;
+    if(confirm('Are you sure want delete this item?')){
+        var aParams = {
+            action: 'delete_item',
+            id: id
+        };
+        $.post(
+            parserUrl + '?r=' + Math.random(),
+            aParams,
+            function(sData) {
+                if(sData == 'OK')
+                    location.reload();
+                else
+                    alert(sData);
+            },
+            'text'
+        );
+        return true;
+    }
+    else
+        return false;
+}
 function saveItemsOrders( sTopItems, aCustomItems )
+{
     var objXmlHttp = createXmlHttpObj();
     if( !objXmlHttp )
         return false;
     var url = parserUrl + '&action=save_orders&top=' + sTopItems;
     for( id in aCustomItems )
+    {
         var sCustomStr = aCustomItems[id];
         if( sCustomStr.length == 0)
             continue;
         url += '&custom[' + id + ']=' + sCustomStr;
+    }
     url += '&r=' + Math.random();
     objXmlHttp.open( "GET", url );
     objXmlHttp.onreadystatechange = function()
+    {
         if ( objXmlHttp.readyState == 4 && objXmlHttp.status == 200 )
+        {
             /*if( objXmlHttp.responseText != 'OK' )
                 alert( objXmlHttp.responseText );*/
+        }
+    }
     objXmlHttp.send( null );
+    var objXmlHttp = createXmlHttpObj();
+    if( !objXmlHttp )
+        return false;
+    var url = parserUrl + '&action=save_orders&top=' + sTopItems;
+    for( id in aCustomItems )
+    {
+        var sCustomStr = aCustomItems[id];
+        if( sCustomStr.length == 0)
+            continue;
+        url += '&custom[' + id + ']=' + sCustomStr;
+    }
+    url += '&r=' + Math.random();
+    objXmlHttp.open( "GET", url );
+    objXmlHttp.onreadystatechange = function()
+    {
+        if ( objXmlHttp.readyState == 4 && objXmlHttp.status == 200 )
+        {
+            /*if( objXmlHttp.responseText != 'OK' )
+                alert( objXmlHttp.responseText );*/
+        }
+    }
+    objXmlHttp.send( null );
+}
 function resetItems()
+{
     if( confirm( 'Reset Will Restore The Builder To Factory Settings :). Are You Sure?' ) )
         location = parserUrl + '&action=reset';
+}
+    if( confirm( 'Reset Will Restore The Builder To Factory Settings :). Are You Sure?' ) )
+        location = parserUrl + '&action=reset';
+}

trunk/administration/js/page_builder_tiny.js

-                      r15201
+                      r15211
 tinyMCE_GZ.init({
     plugins : "style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,contextmenu,paste,directionality,fullscreen,visualchars,nonbreaking,xhtmlxtras",
     themes : "simple,advanced",
     languages : "en",
     disk_cache : true,
     debug : false
+    plugins : "style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,contextmenu,paste,directionality,fullscreen,visualchars,nonbreaking,xhtmlxtras",
+    themes : "simple,advanced",
+    languages : "en",
+    disk_cache : true,
+    debug : false
 });
 tinyMCE.init({
     mode : "textareas",
     theme : "advanced",
     editor_selector : "form_input_html",
     content_css : "plugins/tiny_mce/dolphin.css",
     plugins : "style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,contextmenu,paste,directionality,fullscreen,visualchars,nonbreaking,xhtmlxtras",
     relative_urls : false,
     theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect",
     theme_advanced_buttons2 : "forecolor,backcolor,|,bullist,numlist,|,outdent,indent,|,link,unlink,image,hr,|,sub,sup,|,insertdate,inserttime,|,styleprops",
     theme_advanced_buttons3 : "charmap,emotions,|,cite,abbr,acronym,attribs,|,preview,removeformat,|,code,help",
     theme_advanced_buttons4 : "table,row_props,cell_props,delete_col,delete_row,delete_table,col_after,col_before,row_after,row_before,row_after,row_before,split_cells,merge_cells",
     theme_advanced_toolbar_location : "top",
     theme_advanced_toolbar_align : "center",
+    mode : "textareas",
+    theme : "advanced",
+    editor_selector : "form_input_html",
+    content_css : "plugins/tiny_mce/dolphin.css",
+    plugins : "style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,media,searchreplace,contextmenu,paste,directionality,fullscreen,visualchars,nonbreaking,xhtmlxtras",
+    relative_urls : false,
+    theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,fontselect,fontsizeselect",
+    theme_advanced_buttons2 : "forecolor,backcolor,|,bullist,numlist,|,outdent,indent,|,link,unlink,image,hr,|,sub,sup,|,insertdate,inserttime,|,styleprops",
+    theme_advanced_buttons3 : "charmap,emotions,|,cite,abbr,acronym,attribs,|,preview,removeformat,|,code,help",
+    theme_advanced_buttons4 : "table,row_props,cell_props,delete_col,delete_row,delete_table,col_after,col_before,row_after,row_before,row_after,row_before,split_cells,merge_cells",
+    theme_advanced_toolbar_location : "top",
+    theme_advanced_toolbar_align : "center",
     entity_encoding : "raw",
 …
     paste_convert_headers_to_strong : false,
     paste_remove_spans : false,
     paste_remove_styles : false
+    paste_remove_styles : false
 });

trunk/administration/js/profiles.js

-                      r15201
+                      r15211
 // TODO: remake according to new design and principles
 function BxManageProfiles(oOptions) {
+function BxManageProfiles(oOptions) {
     this._sActionsUrl = oOptions.sActionUrl;
     this._sObjName = oOptions.sObjName == undefined ? 'oMP' : oOptions.sObjName;
 …
     this._oCtlValue['by'] = sBy;
     this._oCtlValue['value'] = sValue;
     this.getMembers(function() {
         $('#adm-mp-members-form > .adm-mp-members-wrapper:hidden').html('');
 …
 BxManageProfiles.prototype.changeFilterTags = function(sTag) {
     this._oCtlValue['value'] = sTag;
     this.getMembers(function() {
         $('#adm-mp-members-form > .adm-mp-members-wrapper:hidden').html('');
 …
 };
 BxManageProfiles.prototype.changeFilterSearch = function () {
     var sValue = $("[name='adm-mp-filter']").val();
+    var sValue = $("[name='adm-mp-filter']").val();
     if(sValue.length <= 0)
         return;
     this._oCtlValue['value'] = sValue;
     this.getMembers(function() {
         $('#adm-mp-members-form > .adm-mp-members-wrapper:hidden').html('');
 …
     this._sCtlType = sType;
     $("[name = 'adm-mp-members-ctl-type']").val(sType);
     $(oLink).parent('.notActive').hide().siblings('.notActive:hidden').show().siblings('.active').hide().siblings('#' + $(oLink).attr('id') + '-act').show();
 …
 };
 BxManageProfiles.prototype.reloadTypeControl = function() {
     var $this = this;
+    var $this = this;
     var oOptions = {
             action: 'get_controls',
             ctl_type: this._sCtlType
         };
+    var oOptions = {
+            action: 'get_controls',
+            ctl_type: this._sCtlType
+        };
     $('#adm-mp-controls-loading').bx_loading();
+    $('#adm-mp-controls-loading').bx_loading();
     $.post(
 …
             $('#adm-mp-ctl-' + $this._sCtlType).bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
                 $(this).replaceWith(oResult.content);
+                $(this).replaceWith(oResult.content);
             });
         },
 …
     this._sViewType = sType;
     $("[name = 'adm-mp-members-view-type']").val(sType);
     $(oLink).parent('.notActive').hide().siblings('.notActive:hidden').show().siblings('.active').hide().siblings('#' + $(oLink).attr('id') + '-act').show();
     if($('#adm-mp-members-' + sType).children().length)
+    if($('#adm-mp-members-' + sType).children().length)
         $('#adm-mp-members-form > .adm-mp-members-wrapper:visible').bx_anim('hide', this._sAnimationEffect, this._iAnimationSpeed, function() {
             $('#adm-mp-members-' + sType).bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
 …
 BxManageProfiles.prototype.getMembers = function(onSuccess) {
     var $this = this;
     if(onSuccess == undefined)
         onSuccess = function(){};
     $('#adm-mp-members-loading').bx_loading();
     var oOptions = {
         action: 'get_members',
         view_type: this._sViewType,
         view_start: this._iStart,
         view_per_page: this._iPerPage,
         view_order: this._sOrderBy,
+        action: 'get_members',
+        view_type: this._sViewType,
+        view_start: this._iStart,
+        view_per_page: this._iPerPage,
+        view_order: this._sOrderBy,
         ctl_type: this._sCtlType
     };
 …
         oOptions['ctl_value[]'].push(sKey + '=' + sValue);
     });
     $.post(
         this._sActionsUrl,
 …
         function(oResult) {
             $('#adm-mp-members-loading').bx_loading();
             $('#adm-mp-members-form > .adm-mp-members-wrapper:visible').bx_anim('hide', $this._sAnimationEffect, $this._iAnimationSpeed, function() {
                 $('#adm-mp-members-' + $this._sViewType).html(oResult.content).bx_anim('show', $this._sAnimationEffect, $this._iAnimationSpeed);
             });
             onSuccess();
         },

trunk/administration/lang_file.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 if(isset($_POST['create_language'])) {
     $mixedResultCreate = createLanguage($_POST);
+}
+}
 else if(isset($_POST['import_language'])) {
     $mixedResultCreate = importLanguage($_POST, $_FILES);
 …
     if(empty($mixedResultAvailable))
         $mixedResultAvailable = '_adm_txt_langs_success_compile';
+}
+}
 else if(isset($_POST['adm-lang-delete']) && !empty($_POST['langs'])) {
     $sNameDefault = getParam('lang_default');
     foreach($_POST['langs'] as $iLangId) {
+    foreach($_POST['langs'] as $iLangId) {
         $sName = getLanguageName($iLangId);
         if($sName == $sNameDefault) {
             $mixedResultAvailable = '_adm_txt_langs_cannot_delete_default';
             break;
+            break;
+        }
         if(!deleteLanguage((int)$iLangId)){
+        if(!deleteLanguage((int)$iLangId)){
             $mixedResultAvailable = '_adm_txt_langs_cannot_delete';
             break;
+        }
+        }
+    }
 …
 else if(isset($_GET['action']) && $_GET['action'] == 'export' && isset($_GET['id'])) {
     $aLanguage = $GLOBALS['MySQL']->getRow("SELECT `Name`, `Flag`, `Title` FROM `sys_localization_languages` WHERE `ID`='" . (int)$_GET['id'] . "' LIMIT 1");
     $aContent = array();
     $aItems = $GLOBALS['MySQL']->getAll("SELECT `tlk`.`Key` AS `key`, `tls`.`String` AS `string` FROM `sys_localization_keys` AS `tlk` LEFT JOIN `sys_localization_strings` AS `tls` ON `tlk`.`ID`=`tls`.`IDKey` WHERE `tls`.`IDLanguage`='" . (int)$_GET['id'] . "'");
+    $aItems = $GLOBALS['MySQL']->getAll("SELECT `tlk`.`Key` AS `key`, `tls`.`String` AS `string` FROM `sys_localization_keys` AS `tlk` LEFT JOIN `sys_localization_strings` AS `tls` ON `tlk`.`ID`=`tls`.`IDKey` WHERE `tls`.`IDLanguage`='" . (int)$_GET['id'] . "'");
     foreach($aItems as $aItem)
         $aContent[$aItem['key']] = $aItem['string'];
 …
     $sName = 'lang_' . $aLanguage['Name'] . '.php';
     $sContent = "<?php\n\$aLangInfo=" . var_export($aLanguage, true) . ";\n\$aLangContent=" . var_export($aContent, true) . ";\n?>";
     header ("Cache-Control: must-revalidate, post-check=0, pre-check=0");
     header ("Content-type: application/octet-stream");
 …
 //--- Create/Delete/Edit Language Key ---//
 if(isset($_POST['action']) && $_POST['action'] == 'get_edit_form_key') {
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo $oJson->encode(array('code' => PageCodeKeyEdit((int)$_POST['id'])));
     exit;
 …
             if(isset($_POST['string_for_' . $aLanguage['id']])) {
                 $GLOBALS['MySQL']->query("INSERT INTO `sys_localization_strings`(`IDKey`, `IDLanguage`, `String`) VALUES('" . $iKeyId . "', '" . $aLanguage['id'] . "', '" . process_db_input($_POST['string_for_' . $aLanguage['id']]) . "')");
                 $bCompiled = $bCompiled && compileLanguage((int)$aLanguage['id']);
+            }
         $aResult = $bCompiled ? array('code' => 0, 'message' => '_adm_txt_langs_success_key_save') : array('code' => 1, 'message' => '_adm_txt_langs_cannot_compile');
     } else
 …
     $aResult['message'] = MsgBox(_t($aResult['message']));
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo "<script>parent.onResult('add', " . $oJson->encode($aResult) . ");</script>";
     exit;
 …
     $aResult['message'] = MsgBox(_t($aResult['message']));
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo "<script>parent.onResult('edit', " . $oJson->encode($aResult) . ");</script>";
     exit;
 …
 if(isset($_POST['adm-lang-key-delete']) && is_array($_POST['keys'])) {
     foreach($_POST['keys'] as $iKeyId)
+    foreach($_POST['keys'] as $iKeyId)
         $GLOBALS['MySQL']->query("DELETE FROM `sys_localization_keys`, `sys_localization_strings` USING `sys_localization_keys`, `sys_localization_strings` WHERE `sys_localization_keys`.`ID`=`sys_localization_strings`.`IDKey` AND `sys_localization_keys`.`ID`='" . $iKeyId . "'");
+}
 …
     'css_name' => array('forms_adv.css', 'lang_file.css'),
     'js_name' => array('lang_file.js'),
     'header' => _t('_adm_page_cpt_lang_file'),
+    'header' => _t('_adm_page_cpt_lang_file'),
 );
 $sLangRssFeed = 'on' == getParam('feeds_enable')
+$sLangRssFeed = 'on' == getParam('feeds_enable')
     ?  DesignBoxAdmin (_t('_adm_box_cpt_lang_files'), '
         <div class="RSSAggrCont" rssid="boonex_unity_lang_files" rssnum="5" member="0">
             <div class="loading_rss">
                 <img src="' . getTemplateImage('loading.gif') . '" alt="' . _t('_loading ...') . '" />
             </div>
         </div>')
+        <div class="RSSAggrCont" rssid="boonex_unity_lang_files" rssnum="5" member="0">
+            <div class="loading_rss">
+                <img src="' . getTemplateImage('loading.gif') . '" alt="' . _t('_loading ...') . '" />
+            </div>
+        </div>')
     : '';
 $_page_cont[$iNameIndex] = array(
     'page_result_code' => $sResult,
+    'page_result_code' => $sResult,
     'page_code_settings' => PageCodeSettings($mixedResultSettings),
     'page_code_create' => PageCodeCreate($mixedResultCreate),
 …
             'lang_default' => array(
                 'type' => 'select',
                 'name' => 'lang_default',
+                'name' => 'lang_default',
                 'caption' => _t('_adm_txt_langs_def_lang'),
                 'values' => array(),
 …
     );
     $aLangs = getLangsArr();
     foreach($aLangs as $sName => $sTitle )
         $aForm['inputs']['lang_default']['values'][] = array('key' => $sName, 'value' => htmlspecialchars_adv( $sTitle ));
+    foreach($aLangs as $sName => $sTitle )
+        $aForm['inputs']['lang_default']['values'][] = array('key' => $sName, 'value' => htmlspecialchars_adv( $sTitle ));
     $oForm = new BxTemplFormView($aForm);
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode()));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
 …
 function PageCodeCreate($mixedResult) {
     $aTopItems = array(
         'adm-langs-btn-files' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:onChangeType(this)', 'title' => _t('_adm_txt_langs_files'), 'active' => 1),
+        'adm-langs-btn-files' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:onChangeType(this)', 'title' => _t('_adm_txt_langs_files'), 'active' => 1),
         'adm-langs-btn-create' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:onChangeType(this)', 'title' => _t('_adm_txt_langs_create'), 'active' => 0),
         'adm-langs-btn-import' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:onChangeType(this)', 'title' => _t('_adm_txt_langs_import'))
 …
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('langs.html', array(
         'content_files' => _getLanguagesList(),
+        'content_files' => _getLanguagesList(),
         'content_create' => _getLanguageCreateForm(),
         'content_import' => _getLanguageImportForm()
 …
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
     return DesignBoxAdmin(_t('_adm_box_cpt_lang_available'), $sResult, $aTopItems);
+}
 …
     $aItems = array();
     $sNameDefault = getParam('lang_default');
     $aLangs = $GLOBALS['MySQL']->getAll("SELECT `ID` AS `id`, `Name` AS `name`, `Title` AS `title`, `Flag` AS `flag` FROM `sys_localization_languages` ORDER BY `Name`");
+    $aLangs = $GLOBALS['MySQL']->getAll("SELECT `ID` AS `id`, `Name` AS `name`, `Title` AS `title`, `Flag` AS `flag` FROM `sys_localization_languages` ORDER BY `Name`");
     foreach($aLangs as $aLang)
         $aItems[] = array(
 …
             'export_link' => $GLOBALS['site']['url_admin'] . 'lang_file.php?action=export&id=' . $aLang['id']
         );
     //--- Get Controls ---//
     $aButtons = array(
         'adm-lang-compile' => _t('_adm_txt_langs_compile'),
         'adm-lang-delete' => _t('_adm_txt_langs_delete')
     );
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-langs-form', $aButtons, 'langs');
 …
+}
 function _getLanguageCreateForm(){
     if(isset($_POST['action']) && $_POST['action'] == 'get_edit_form_language' && isset($_POST['id']))
+    if(isset($_POST['action']) && $_POST['action'] == 'get_edit_form_language' && isset($_POST['id']))
         $aLanguage = $GLOBALS['MySQL']->getRow("SELECT `ID` AS `id`, `Name` AS `name`, `Flag` AS `flag`, `Title` AS `title` FROM `sys_localization_languages` WHERE `ID`='" . (int)$_POST['id'] . "' LIMIT 1");
 …
             'CopyLanguage_SourceLangID' => array(
                 'type' => 'select',
                 'name' => 'CopyLanguage_SourceLangID',
+                'name' => 'CopyLanguage_SourceLangID',
                 'caption' => _t('_adm_txt_langs_copy_from'),
                 'values' => array()
 …
     //--- Copy from ---//
     $aLangs = getLangsArr(false, true);
     foreach($aLangs as $iId => $sName)
         $aFormCreate['inputs']['CopyLanguage_SourceLangID']['values'][] = array('key' => $iId, 'value' => htmlspecialchars_adv( $sName ));
+    foreach($aLangs as $iId => $sName)
+        $aFormCreate['inputs']['CopyLanguage_SourceLangID']['values'][] = array('key' => $iId, 'value' => htmlspecialchars_adv( $sName ));
     //--- Flags ---//
+    $aCountries = $GLOBALS['MySQL']->getAll("SELECT `ISO2` AS `code`, `Country` AS `title` FROM `sys_countries` ORDER BY `Country`");
     foreach($aCountries AS $aCountry) {
+    $aCountries = $GLOBALS['MySQL']->getAll("SELECT `ISO2` AS `code`, `Country` AS `title` FROM `sys_countries` ORDER BY `Country`");
+    foreach($aCountries AS $aCountry) {
         $sCode = strtolower($aCountry['code']);
         $aFormCreate['inputs']['Flag']['values'][] = array('key' => $sCode, 'value' => $aCountry['title']);
+    }
     if(!empty($aLanguage)) {
+    }
+    if(!empty($aLanguage)) {
         unset($aFormCreate['inputs']['CopyLanguage_SourceLangID']);
         $aFormCreate['inputs']['id'] = array(
 …
             'value' => $aLanguage['id']
         );
+    }
     $oForm = new BxTemplFormView($aFormCreate);
+    }
+    $oForm = new BxTemplFormView($aFormCreate);
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('langs_form_create.html', array(
         'display' => !empty($aLanguage) ? 'block' : 'none',
         'form' => $oForm->getCode()
+        'display' => !empty($aLanguage) ? 'block' : 'none',
+        'form' => $oForm->getCode()
     ));
+}
 …
             'method' => 'post',
             'enctype' => 'multipart/form-data'
         ),
+        ),
         'inputs' => array(
             'ImportLanguage_File' => array(
                 'type' => 'file',
                 'name' => 'ImportLanguage_File',
+                'name' => 'ImportLanguage_File',
                 'caption' => _t('_adm_txt_langs_file'),
             ),
 …
+            )
+        )
     );
     $oForm = new BxTemplFormView($aFormImport);
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('langs_form_import.html', array(
         'display' => !empty($aLanguage) ? 'block' : 'none',
         'form' => $oForm->getCode()
+    );
+    $oForm = new BxTemplFormView($aFormImport);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('langs_form_import.html', array(
+        'display' => !empty($aLanguage) ? 'block' : 'none',
+        'form' => $oForm->getCode()
     ));
+}
 …
             );
+    }
     //--- Get Controls ---//
     $aButtons = array(
+    $aButtons = array(
         'adm-lang-key-delete' => _t('_adm_txt_langs_delete')
     );
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-keys-form', $aButtons, 'keys');
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('langs_keys.html', array(
         'filter_value' => $sFilter,
 …
         'url_admin' => $GLOBALS['site']['url_admin']
     ));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
     return DesignBoxAdmin(_t('_adm_box_cpt_lang_keys'), $sResult);
+}
 …
         ),
         'params' => array(),
         'inputs' => array(
+        'inputs' => array(
             'name' => array(
                 'type' => 'text',
 …
                 'value' => '',
                 'values' => array()
             ),
+            ),
+        )
     );
     $aCategories = $GLOBALS['MySQL']->getAll("SELECT `ID` AS `id`, `Name` AS `title` FROM `sys_localization_categories`");
     foreach($aCategories as $aCategory)
+    foreach($aCategories as $aCategory)
         $aForm['inputs']['category']['values'][] = array('key' => $aCategory['id'], 'value' => $aCategory['title']);
 …
         ),
         'params' => array(),
         'inputs' => array(
+        'inputs' => array(
             'id' => array(
                 'type' => 'hidden',
 …
             ),
+        )
     );
+    );
     $aStrings = $GLOBALS['MySQL']->getAllWithKey("SELECT CONCAT('string_for_', `IDLanguage`) AS `key`, `String` AS `value` FROM `sys_localization_strings` WHERE `IDKey`='" . $iId . "'", "key");
 …
 function createLanguage(&$aData) {
     global $MySQL;
     $sTitle = process_db_input($aData['CopyLanguage_Title']);
     $sName  = mb_strtolower( process_db_input($aData['CopyLanguage_Name']) );
     $sFlag = htmlspecialchars_adv($aData['Flag']);
     $iSourceId = isset($aData['CopyLanguage_SourceLangID']) ? (int)$aData['CopyLanguage_SourceLangID'] : 0;
+    if(strlen($sTitle) <= 0)
+    $sTitle = process_db_input($aData['CopyLanguage_Title']);
+    $sName  = mb_strtolower( process_db_input($aData['CopyLanguage_Name']) );
+    $sFlag = htmlspecialchars_adv($aData['Flag']);
+    $iSourceId = isset($aData['CopyLanguage_SourceLangID']) ? (int)$aData['CopyLanguage_SourceLangID'] : 0;
+    if(strlen($sTitle) <= 0)
         return '_adm_txt_langs_empty_title';
     if(strlen($sName) <= 0)
+    if(strlen($sName) <= 0)
         return '_adm_txt_langs_empty_name';
 …
         return '_adm_txt_langs_success_updated';
+    }
     $mixedResult = $MySQL->query("INSERT INTO `sys_localization_languages` (`Name`, `Flag`, `Title`) VALUES ('{$sName}', '{$sFlag}', '{$sTitle}')");
+    if($mixedResult === false)
+    $mixedResult = $MySQL->query("INSERT INTO `sys_localization_languages` (`Name`, `Flag`, `Title`) VALUES ('{$sName}', '{$sFlag}', '{$sTitle}')");
+    if($mixedResult === false)
         return '_adm_txt_langs_cannot_create';
     $iId = db_last_id();
     $aStrings = $MySQL->getAll("SELECT  `IDKey`, `String` FROM  `sys_localization_strings` WHERE    `IDLanguage` = $iSourceId");
     foreach($aStrings as $aString){
         $aString['String'] = addslashes($aString['String']);
         $MySQL->query("INSERT INTO `sys_localization_strings`(`IDKey`, `IDLanguage`, `String`) VALUES ('{$aString['IDKey']}', $iId, '{$aString['String']}')");
         if( !db_affected_rows() )
             return '_adm_txt_langs_cannot_add_string';
+    }
     return '_adm_txt_langs_success_create';
+}
 function importLanguage(&$aData, &$aFiles) {
+    $iId = db_last_id();
+    $aStrings = $MySQL->getAll("SELECT    `IDKey`, `String` FROM    `sys_localization_strings` WHERE    `IDLanguage` = $iSourceId");
+    foreach($aStrings as $aString){
+        $aString['String'] = addslashes($aString['String']);
+        $MySQL->query("INSERT INTO `sys_localization_strings`(`IDKey`, `IDLanguage`, `String`) VALUES ('{$aString['IDKey']}', $iId, '{$aString['String']}')");
+        if( !db_affected_rows() )
+            return '_adm_txt_langs_cannot_add_string';
+    }
+    return '_adm_txt_langs_success_create';
+}
+function importLanguage(&$aData, &$aFiles) {
     global $MySQL;
     $sTmpPath = $GLOBALS['dir']['tmp'] . mktime() . ".php";
     if(!file_exists($aFiles['ImportLanguage_File']['tmp_name']) || !move_uploaded_file($aFiles['ImportLanguage_File']['tmp_name'], $sTmpPath))
+    $sTmpPath = $GLOBALS['dir']['tmp'] . mktime() . ".php";
+    if(!file_exists($aFiles['ImportLanguage_File']['tmp_name']) || !move_uploaded_file($aFiles['ImportLanguage_File']['tmp_name'], $sTmpPath))
         return '_adm_txt_langs_cannot_upload_file';
     require_once($sTmpPath);
     $aLangInfo = isset($aLangInfo) ? $aLangInfo : $LANG_INFO;
     $aLangContent = isset($aLangContent) ? $aLangContent : $LANG;
     if (empty($aLangInfo) || empty($aLangContent)) {
         return '_adm_txt_langs_cannot_create';
+    }
+    $aLangInfo = isset($aLangInfo) ? $aLangInfo : $LANG_INFO;
+    $aLangContent = isset($aLangContent) ? $aLangContent : $LANG;
+    if (empty($aLangInfo) || empty($aLangContent)) {
+        return '_adm_txt_langs_cannot_create';
+    }
     $mixedResult = $MySQL->query("INSERT INTO `sys_localization_languages` (`Name`, `Flag`, `Title`) VALUES ('" . $aLangInfo['Name'] . "', '" . $aLangInfo['Flag'] . "', '" . $aLangInfo['Title'] . "')");
     if($mixedResult === false) {
+        @unlink($sTmpPath);
+    if($mixedResult === false) {
+        @unlink($sTmpPath);
         return '_adm_txt_langs_cannot_create';
+    }
+    }
     $iId = (int)$MySQL->lastId();
 …
             continue;
         $MySQL->query("INSERT INTO `sys_localization_strings`(`IDKey`, `IDLanguage`, `String`) VALUES ('" . $aKeys[$sKey]['id'] . "', " . $iId . ", '" . addslashes($sString) . "')");
+    }
     compileLanguage($iId);
     @unlink($sTmpPath);
     return '_adm_txt_langs_success_import';
+        $MySQL->query("INSERT INTO `sys_localization_strings`(`IDKey`, `IDLanguage`, `String`) VALUES ('" . $aKeys[$sKey]['id'] . "', " . $iId . ", '" . addslashes($sString) . "')");
+    }
+    compileLanguage($iId);
+    @unlink($sTmpPath);
+    return '_adm_txt_langs_success_import';
+}
 function getLanguageName($iId) {
     return $GLOBALS['MySQL']->getOne("SELECT `Name` FROM `sys_localization_languages` WHERE `ID`='" . (int)$iId . "' LIMIT 1");
+    return $GLOBALS['MySQL']->getOne("SELECT `Name` FROM `sys_localization_languages` WHERE `ID`='" . (int)$iId . "' LIMIT 1");
+}

trunk/administration/login_form.html

-                      r15201
+                      r15211
 <div class="login">
     <div class="login_header">__header_text__</div>
+    <div class="login_form">
         <form action="__action_url__" method="POST">
         <input type="hidden" name="relocate" value="__relocate_url__" />
             <div class="login_form_row">
                 <div class="clear_both"></div>
                 <div class="login_form_label">__name_label__:</div>
                 <div class="login_form_val">
                     <input type="text" name="ID" class="login_form_input" />
                 </div>
                 <div class="clear_both"></div>
             </div>
             <div class="login_form_row">
                 <div class="clear_both"></div>
                 <div class="login_form_label">__password_label__:</div>
                 <div class="login_form_val">
                     <input type="password" name="Password" class="login_form_input" />
                 </div>
                 <div class="clear_both"></div>
             </div>
             <div class="login_form_row">
                 <div class="clear_both"></div>
                 <div class="login_form_label"></div>
                 <div class="login_form_val">
                     <input type="submit" value="Enter" class="login_form_submit" />
                 </div>
                 <div class="clear_both"></div>
             </div>
         </form>
     </div>
+    <div class="login_header">__header_text__</div>
+    <div class="login_form">
+        <form action="__action_url__" method="POST">
+        <input type="hidden" name="relocate" value="__relocate_url__" />
+            <div class="login_form_row">
+                <div class="clear_both"></div>
+                <div class="login_form_label">__name_label__:</div>
+                <div class="login_form_val">
+                    <input type="text" name="ID" class="login_form_input" />
+                </div>
+                <div class="clear_both"></div>
+            </div>
+            <div class="login_form_row">
+                <div class="clear_both"></div>
+                <div class="login_form_label">__password_label__:</div>
+                <div class="login_form_val">
+                    <input type="password" name="Password" class="login_form_input" />
+                </div>
+                <div class="clear_both"></div>
+            </div>
+            <div class="login_form_row">
+                <div class="clear_both"></div>
+                <div class="login_form_label"></div>
+                <div class="login_form_val">
+                    <input type="submit" value="Enter" class="login_form_submit" />
+                </div>
+                <div class="clear_both"></div>
+            </div>
+        </form>
+    </div>
 </div>

trunk/administration/manage_subscribers.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 bx_import('BxDolSubscription');
 bx_import('BxTemplSearchResult');
 $logged['admin'] = member_auth( 1, true, true );
 …
         'count' => $oSubscription->getSubscribersCount(),
         'page_url' => $GLOBALS['site']['url_admin'] . 'manage_subscribers.php?start={start}'
     ));
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-ms-form', array(
         'adm-ms-delete' => _t('_adm_btn_ms_delete')
     ), 'members');
     $aSubscribers = $oSubscription->getSubscribers(BX_DOL_SBS_TYPE_VISITOR, $iStart, $iPerPage);

trunk/administration/memb_levels.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $logged['admin'] = member_auth( 1, true, true );
 $oSettings = new BxDolAdminSettings(5);
+$oSettings = new BxDolAdminSettings(5);
 //--- Process submit ---//
 …
     else if(isset($_POST['adm-mlevels-disable']))
         $sValue = 'no';
     $GLOBALS['MySQL']->query("UPDATE `sys_acl_levels` SET `Active`='" . $sValue . "' WHERE `ID` IN ('" . implode("','", $_POST['levels']) . "')");
 } else if(isset($_POST['adm-mlevels-delete']) && !empty($_POST['levels'])) {
 …
         if(isset($_POST['adm-mlevels-actions-enable']))
             $sQuery = "REPLACE INTO `sys_acl_matrix` SET `IDLevel`='" . $iLevelId . "', `IDAction`='" . $iId . "'";
         else
+        else
             $sQuery = "DELETE FROM `sys_acl_matrix` WHERE `IDLevel`='" . $iLevelId . "' AND `IDAction`='" . $iId . "'";
 …
     $iDays = (int)$_POST['days'];
     $iPrice = (float)trim($_POST['price'], " $");
     $GLOBALS['MySQL']->query("INSERT INTO `sys_acl_level_prices`(`IDLevel`, `Days`, `Price`) VALUES('" . $iLevelId . "', '" . $iDays . "', '" . $iPrice . "')");
 } else if(isset($_POST['adm-mlevels-prices-delete'])) {
 …
     $sQuery = "REPLACE INTO `sys_acl_matrix` SET `IDLevel`='" . $_POST['levelId'] . "', `IDAction`='" . $_POST['actionId'] . "'";
     $sQuery .= !empty($_POST['allowedCnt']) ? ", `AllowedCount`='" . $_POST['allowedCnt'] . "'" : "";
     $sQuery .= !empty($_POST['period']) ? ", `AllowedPeriodLen`='" . $_POST['period'] . "'" : "";
+    $sQuery .= !empty($_POST['period']) ? ", `AllowedPeriodLen`='" . $_POST['period'] . "'" : "";
     $sQuery .= !empty($_POST['dateStart']) ? ", `AllowedPeriodStart`=FROM_UNIXTIME(" . strtotime($_POST['dateStart']) . ")" : "";
     $sQuery .= !empty($_POST['dateEnd']) ? ", `AllowedPeriodEnd`=FROM_UNIXTIME(" . strtotime($_POST['dateEnd']) . ")" : "";
     $aResult = $GLOBALS['MySQL']->query($sQuery) > 0 ? array('code' => 0, 'message' => MsgBox(_t('_adm_txt_mlevels_action_saved'))) : array('code' => 1, 'message' => MsgBox(_t('_adm_txt_mlevels_action_cannot_save')));
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo "<script>parent.onResult(" . $oJson->encode($aResult) . ");</script>";
     exit;
 } else if(isset($_POST['action']) && $_POST['action'] == 'get_edit_form_action') {
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo $oJson->encode(array('code' => PageCodeAction((int)$_POST['level_id'], (int)$_POST['action_id'], $mixedResultAction)));
     exit;
+}
 $iLevelId = bx_get('level') !== false ? (int)bx_get('level') : 0;
 …
     'css_name' => array('forms_adv.css', 'settings.css', 'memb_levels.css', 'plugins/jquery/themes/|ui.datepicker.css'),
     'js_name' => array('ui.datepicker.js', 'memb_levels.js'),
     'header' => _t('_adm_page_cpt_memb_levels'),
+    'header' => _t('_adm_page_cpt_memb_levels'),
 );
 $_page_cont[$iNameIndex] = array(
 …
 function PageCodeSettings($mixedResult) {
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $GLOBALS['oSettings']->getForm()));
+    $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $GLOBALS['oSettings']->getForm()));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = $mixedResult . $sResult;
     return DesignBoxAdmin(_t('_adm_box_cpt_mlevel_settings'), $sResult);
+}
 …
             ),
         ),
         'inputs' => array (
+        'inputs' => array (
             'Active' => array(
                 'type' => 'hidden',
 …
                 ),
                 'checker' => array (
                     'func' => 'length',
                     'params' => array(3,100),
                     'error' => _t('_adm_txt_mlevels_name_err'),
                 ),
+                    'func' => 'length',
+                    'params' => array(3,100),
+                    'error' => _t('_adm_txt_mlevels_name_err'),
+                ),
             ),
             'Icon' => array(
 …
                 'name' => 'Icon',
                 'caption' => _t('_adm_txt_mlevels_icon'),
                 'value' => '',
+                'value' => '',
                 'checker' => array (
                     'func' => '',
                     'params' => '',
                     'error' => _t('_adm_txt_mlevels_icon_err'),
                 ),
+                    'func' => '',
+                    'params' => '',
+                    'error' => _t('_adm_txt_mlevels_icon_err'),
+                ),
             ),
             'Description' => array(
 …
                 'name' => 'submit',
                 'value' => _t('_adm_btn_mlevels_add'),
             ),
+            ),
+        )
     );
 …
     $sFilePath = BX_DIRECTORY_PATH_ROOT . 'media/images/membership/';
     $sFileName = time();
     $sFileExt = '';
+    $sFileExt = '';
     if($oForm->isSubmittedAndValid() && $bFile = (isImage($_FILES['Icon']['type'], $sFileExt) && !empty($_FILES['Icon']['tmp_name']) && move_uploaded_file($_FILES['Icon']['tmp_name'],  $sFilePath . $sFileName . '.' . $sFileExt))) {
         $sPath = $sFilePath . $sFileName . '.' . $sFileExt;
         imageResize($sPath, $sPath, 110, 110);
         $iId = (int)$oForm->insert(array('Icon' => $sFileName . '.' . $sFileExt));
         if($iId != 0)
             addStringToLanguage("_adm_txt_mp_" . strtolower(bx_get('name')), bx_get('name'));
+         header('Location: ' . $oForm->aFormAttrs['action']);
+        $sPath = $sFilePath . $sFileName . '.' . $sFileExt;
+        imageResize($sPath, $sPath, 110, 110);
+        $iId = (int)$oForm->insert(array('Icon' => $sFileName . '.' . $sFileExt));
+        if($iId != 0)
+            addStringToLanguage("_adm_txt_mp_" . strtolower(bx_get('name')), bx_get('name'));
+         header('Location: ' . $oForm->aFormAttrs['action']);
     } else {
         if(!$bFile)
             $oForm->aInputs['Icon']['error'] = $oForm->aInputs['Icon']['checker']['error'];
+        if(!$bFile)
+            $oForm->aInputs['Icon']['error'] = $oForm->aInputs['Icon']['checker']['error'];
         return DesignBoxAdmin(_t('_adm_box_cpt_mlevel_create'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode())));
+    }
 …
                     'title' => $aLevel['title']
+                )
             ),
+            ),
         );
     //--- Get Controls ---//
     $aButtons = array(
 …
         'adm-mlevels-disable' => _t('_adm_btn_mlevels_disable'),
         'adm-mlevels-delete' => _t('_adm_btn_mlevels_delete')
     );
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-mlevels-list-form', $aButtons, 'levels');
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('mlevels_list.html', array('bx_repeat:items' => $aItems, 'controls' => $sControls));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
 …
     $aButtons = array(
         'adm-mlevels-actions-enable' => _t('_adm_btn_mlevels_enable'),
         'adm-mlevels-actions-disable' => _t('_adm_btn_mlevels_disable')
     );
+        'adm-mlevels-actions-disable' => _t('_adm_btn_mlevels_disable')
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-mlevels-actions-form', $aButtons, 'actions');
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('mlevels_actions.html', array(
         'id' => $iId,
 …
         'url_admin' => $GLOBALS['site']['url_admin']
     ));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
 …
 function PageCodeAction($iLevelId, $iActionId, $mixedResult) {
     $aAction = $GLOBALS['MySQL']->getRow("SELECT * FROM `sys_acl_matrix` WHERE `IDLevel`='" . $iLevelId . "' AND `IDAction`='" . $iActionId . "'");
     $aForm = array(
         'form_attrs' => array(
 …
             'action' => $GLOBALS['site']['url_admin'] . 'memb_levels.php',
             'method' => 'post',
             'enctype' => 'multipart/form-data'
+            'enctype' => 'multipart/form-data'
         ),
         'params' => array (),
         'inputs' => array (
+        'inputs' => array (
             'levelId' => array(
                 'type' => 'hidden',
 …
                 'value' => isset($aAction['AllowedPeriodEnd']) ? $aAction['AllowedPeriodEnd'] : "",
                 'display' => 'filterDate',
             ),
+            ),
             'adm-mlevels-action-save' => array(
                 'type' => 'submit',
                 'name' => 'adm-mlevels-action-save',
                 'value' => _t('_adm_btn_mlevels_save'),
             ),
+            ),
+        )
     );
 …
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('mlevels_action.html', array(
         'content' => $oForm->getCode()
+        'content' => $oForm->getCode()
     ));
     if($mixedResult !== true && !empty($mixedResult))
         $sResult = MsgBox(_t($mixedResult), 3) . $sResult;
 …
     $oModuleDb = new BxDolModuleDb();
     if($oModuleDb->isModule('payment')) {
         $aInfo = BxDolService::call('payment', 'get_currency_info');
         $sCurrencySign = $aInfo['sign'];
+    }
     else
         $sCurrencySign = getParam('currency_sign');
+        $aInfo = BxDolService::call('payment', 'get_currency_info');
+        $sCurrencySign = $aInfo['sign'];
+    }
+    else
+        $sCurrencySign = getParam('currency_sign');
     $aPrices = $GLOBALS['MySQL']->getAll("SELECT `id` AS `id`, `Days` AS `days`, `Price` AS `price` FROM `sys_acl_level_prices` WHERE `IDLevel`='" . $iId . "' ORDER BY `id`");
 …
     $aButtons = array(
         'adm-mlevels-prices-delete' => _t('_adm_btn_mlevels_delete')
     );
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-mlevels-prices-form', $aButtons, 'prices');
     $sResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('mlevels_prices.html', array(
         'id' => $iId,
 …
+}
 function isImage($sMimeType, &$sFileExtension) {
     $bResult = true;
     switch($sMimeType) {
         case 'image/jpeg':
         case 'image/pjpeg':
             $sFileExtension = 'jpg';
             break;
         case 'image/png':
         case 'image/x-png':
             $sFileExtension = 'png';
             break;
         case 'image/gif':
             $sFileExtension = 'gif';
             break;
         default:
             $bResult = false;
+    }
     return $bResult;
+    $bResult = true;
+    switch($sMimeType) {
+        case 'image/jpeg':
+        case 'image/pjpeg':
+            $sFileExtension = 'jpg';
+            break;
+        case 'image/png':
+        case 'image/x-png':
+            $sFileExtension = 'png';
+            break;
+        case 'image/gif':
+            $sFileExtension = 'gif';
+            break;
+        default:
+            $bResult = false;
+    }
+    return $bResult;
+}
 function deleteMembership($iId) {
     $iId = (int)$iId;
     $aLevel = $GLOBALS['MySQL']->getRow("SELECT `Icon` AS `icon`, `Removable` AS `removable` FROM `sys_acl_levels` WHERE `ID`='" . $iId . "'");
     if(empty($aLevel))
         return "_adm_txt_mlevels_not_found";
     //Check if membership can be removed
     if($aLevel['removable'] != 'yes')
         return '_adm_txt_mlevels_cannot_remove';
     //Check if there are still members using this membership
     $iDateExpires = $GLOBALS['MySQL']->getOne("SELECT UNIX_TIMESTAMP(MAX(`DateExpires`)) as `MaxDateExpires` FROM `sys_acl_levels_members` WHERE `IDLevel`='" . $iId . "'");
     if($iDateExpires > time())
         return "_adm_txt_mlevels_is_used";
     @unlink(BX_DIRECTORY_PATH_ROOT . 'media/images/membership/' . $aLevel['icon']);
     db_res("DELETE FROM `sys_acl_level_prices` WHERE `IDLevel`='" . $iId . "'");
     db_res("DELETE FROM `sys_acl_matrix` WHERE `IDLevel`='" . $iId . "'");
     db_res("DELETE FROM `sys_acl_levels` WHERE `ID`='" . $iId . "'");
     return true;
+    $iId = (int)$iId;
+    $aLevel = $GLOBALS['MySQL']->getRow("SELECT `Icon` AS `icon`, `Removable` AS `removable` FROM `sys_acl_levels` WHERE `ID`='" . $iId . "'");
+    if(empty($aLevel))
+        return "_adm_txt_mlevels_not_found";
+    //Check if membership can be removed
+    if($aLevel['removable'] != 'yes')
+        return '_adm_txt_mlevels_cannot_remove';
+    //Check if there are still members using this membership
+    $iDateExpires = $GLOBALS['MySQL']->getOne("SELECT UNIX_TIMESTAMP(MAX(`DateExpires`)) as `MaxDateExpires` FROM `sys_acl_levels_members` WHERE `IDLevel`='" . $iId . "'");
+    if($iDateExpires > time())
+        return "_adm_txt_mlevels_is_used";
+    @unlink(BX_DIRECTORY_PATH_ROOT . 'media/images/membership/' . $aLevel['icon']);
+    db_res("DELETE FROM `sys_acl_level_prices` WHERE `IDLevel`='" . $iId . "'");
+    db_res("DELETE FROM `sys_acl_matrix` WHERE `IDLevel`='" . $iId . "'");
+    db_res("DELETE FROM `sys_acl_levels` WHERE `ID`='" . $iId . "'");
+    return true;
+}
 ?>

trunk/administration/member_menu_compose.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $GLOBALS['oAdmTemplate']->addJsTranslation(array(
     '_adm_mbuilder_Sorry_could_not_insert_object',
     '_adm_mbuilder_This_items_are_non_editable'
+    '_adm_mbuilder_Sorry_could_not_insert_object',
+    '_adm_mbuilder_This_items_are_non_editable'
 ));
 …
 $aMenuSection = array (
     'top', 'top_extra'
+    'top', 'top_extra'
 );
 …
 if ( isset($_GET['menu_position']) ) {
     foreach( $aMenuSection AS $sValue ) {
+        if ( $sValue == $_GET['menu_position'] ) {
             $sMenuSection = $sValue;
             break;
+        }
+    }
+    foreach( $aMenuSection AS $sValue ) {
+        if ( $sValue == $_GET['menu_position'] ) {
+            $sMenuSection = $sValue;
+            break;
+        }
+    }
+}
 // ** FOR 'AJAX' REQUESTS ;
 if(bx_get('action') !== false) {
     switch(bx_get('action')) {
         case 'edit_form':
             $id = (int)bx_get('id');
             $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_member` WHERE `ID` = $id", 0 );
             $sResponce = ($aItem) ? showEditForm($aItem, $sMenuSection) : echoMenuEditMsg('Error', 'red');
             break;
         case 'create_item':
             $newID = createNewElement($_POST['type'], (int)$_POST['source'], $sMenuSection);
             $sResponce =  $newID;
             break;
         case 'deactivate_item':
             $res = db_res( "UPDATE `sys_menu_member` SET `Active`='0' WHERE `ID`=" . (int)bx_get('id') );
+    switch(bx_get('action')) {
+        case 'edit_form':
+            $id = (int)bx_get('id');
+            $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_member` WHERE `ID` = $id", 0 );
+            $sResponce = ($aItem) ? showEditForm($aItem, $sMenuSection) : echoMenuEditMsg('Error', 'red');
+            break;
+        case 'create_item':
+            $newID = createNewElement($_POST['type'], (int)$_POST['source'], $sMenuSection);
+            $sResponce =  $newID;
+            break;
+        case 'deactivate_item':
+            $res = db_res( "UPDATE `sys_menu_member` SET `Active`='0' WHERE `ID`=" . (int)bx_get('id') );
             $sResponce =  db_affected_rows();
             break;
         case 'save_item':
             $id = (int)$_POST['id'];
             if( !$id ) {
                 $sResponce = echoMenuEditMsg( 'Error', 'red' );
             } else {
+            break;
+        case 'save_item':
+            $id = (int)$_POST['id'];
+            if( !$id ) {
+                $sResponce = echoMenuEditMsg( 'Error', 'red' );
+            } else {
                 $aItemFields = array( 'Name', 'Caption', 'Link', 'Target', 'Icon', 'Script' );
                 $aItem = array();
+                $aItem = array();
                 foreach( $aItemFields as $field ) {
                     $aItem[$field] = ( isset($_POST[$field]) ) ? $_POST[$field] : null ;
+                }
+                    $aItem[$field] = ( isset($_POST[$field]) ) ? $_POST[$field] : null ;
+                }
                 if ( !$aItem['Icon'] ) {
 …
+                }
                 $res = saveItem( $id, $aItem, $sMenuSection );
                 updateLangFile( $_POST['Caption'], $_POST['LangCaption'] );
                 $res['message'] = MsgBox($res['message']);
                 $oJson = new Services_JSON();
                 echo $oJson->encode($res);
+                $res = saveItem( $id, $aItem, $sMenuSection );
+                updateLangFile( $_POST['Caption'], $_POST['LangCaption'] );
+                $res['message'] = MsgBox($res['message']);
+                $oJson = new Services_JSON();
+                echo $oJson->encode($res);
                 exit;
+            }
             break;
         case 'delete_item':
             $id = (int)$_POST['id'];
             if( !$id ) {
                 $sResponce = 'Item ID is not specified';
             } else {
                 $aItem = db_arr( "SELECT `Deletable` FROM `sys_menu_member` WHERE `ID` = $id" );
                 if( !$aItem ) {
                     $sResponce = 'Item not found';
                 } else if( !(int)$aItem['Deletable'] ) {
                     $sResponce = 'Item is non-deletable';
                 } else {
                     db_res( "DELETE FROM `sys_menu_member` WHERE `ID` = $id" );
                     $sResponce = ( db_affected_rows() ) ? 'OK' : 'Couldn\'t delete the item';
+                }
+            }
             break;
         case 'save_orders':
             saveOrders( bx_get('top'), bx_get('custom'), $sMenuSection );
             $sResponce = 'OK';
             break;
+    }
+            break;
+        case 'delete_item':
+            $id = (int)$_POST['id'];
+            if( !$id ) {
+                $sResponce = 'Item ID is not specified';
+            } else {
+                $aItem = db_arr( "SELECT `Deletable` FROM `sys_menu_member` WHERE `ID` = $id" );
+                if( !$aItem ) {
+                    $sResponce = 'Item not found';
+                } else if( !(int)$aItem['Deletable'] ) {
+                    $sResponce = 'Item is non-deletable';
+                } else {
+                    db_res( "DELETE FROM `sys_menu_member` WHERE `ID` = $id" );
+                    $sResponce = ( db_affected_rows() ) ? 'OK' : 'Couldn\'t delete the item';
+                }
+            }
+            break;
+        case 'save_orders':
+            saveOrders( bx_get('top'), bx_get('custom'), $sMenuSection );
+            $sResponce = 'OK';
+            break;
+    }
     // return script's response and recompile the menu cache ;
 …
 // generate all active menu items ;
 $sTopQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_member` WHERE `Active`='1' AND `Position`='{$sMenuSection}' AND `Type`<>'linked_item' ORDER BY `Order`";
+$sTopQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_member`    WHERE `Active`='1' AND `Position`='{$sMenuSection}' AND `Type`<>'linked_item' ORDER BY `Order`";
 $rTopItems = db_res($sTopQuery);
 …
 $sComposerInit = "
     <script type=\"text/javascript\">
         topParentID = 'menu_app_wrapper';
         urlIconLoading = '{$site['url_admin']}images/loading.gif';
         parserUrl = '" . $GLOBALS['site']['url_admin'] . "member_menu_compose.php?menu_position={$sMenuSection}';
         allowNewItem = true;
         allowAddToTop = true;
         allowAddToCustom = false;
         iInactivePerRow = 5;
         sendSystemOrder = false;
         aCoords = {};
         aCoords['startX'] = 270;
         aCoords['startY'] = 235;
         aCoords['width']  = 92;
         aCoords['height'] = 21;
         aCoords['diffX']  = 122;
         aCoords['diffY']  = 32;
         aTopItems = {};
         aCustomItems = {};
         aSystemItems = {};
         aAllItems = {};
+    <script type=\"text/javascript\">
+        topParentID = 'menu_app_wrapper';
+        urlIconLoading = '{$site['url_admin']}images/loading.gif';
+        parserUrl = '" . $GLOBALS['site']['url_admin'] . "member_menu_compose.php?menu_position={$sMenuSection}';
+        allowNewItem = true;
+        allowAddToTop = true;
+        allowAddToCustom = false;
+        iInactivePerRow = 5;
+        sendSystemOrder = false;
+        aCoords = {};
+        aCoords['startX'] = 270;
+        aCoords['startY'] = 235;
+        aCoords['width']  = 92;
+        aCoords['height'] = 21;
+        aCoords['diffX']  = 122;
+        aCoords['diffY']  = 32;
+        aTopItems = {};
+        aCustomItems = {};
+        aSystemItems = {};
+        aAllItems = {};
 ";
 $iIndex = 0;
 while(($aTopItem = mysql_fetch_assoc($rTopItems)) !== false) {
     $sComposerInit .= "
         aTopItems[$iIndex] = [{$aTopItem['ID']}, '" . addslashes( $aTopItem['Name'] ) . "', {$aTopItem['Movable']}];
         aCustomItems[$iIndex] = {};";
     $iIndex++;
+    $sComposerInit .= "
+        aTopItems[$iIndex] = [{$aTopItem['ID']}, '" . addslashes( $aTopItem['Name'] ) . "', {$aTopItem['Movable']}];
+        aCustomItems[$iIndex] = {};";
+    $iIndex++;
+}
 $sComposerInit .= "\n";
 while(($aAllItem = mysql_fetch_assoc($rAllItems)) !== false) {
     $sComposerInit .= "
         aAllItems[{$aAllItem['ID']}] = '" . addslashes( $aAllItem['Name'] ) . "';";
+}
     $sComposerInit .= "
     </script>
+    $sComposerInit .= "
+        aAllItems[{$aAllItem['ID']}] = '" . addslashes( $aAllItem['Name'] ) . "';";
+}
+    $sComposerInit .= "
+    </script>
 ";
 …
 $_page_cont[$iNameIndex]['controls'] = getSwitcherBlock();
 $_page_cont[$iNameIndex]['page_main_code'] = $GLOBALS['oAdmTemplate']->parseHtmlByName('menu_compose.html', array(
     'extra_js' => $sComposerInit
+    'extra_js' => $sComposerInit
 ));
 …
+{
     global $aMenuSection;
     $sOutputCode = '<div class="dbTopMenu">';
     foreach($aMenuSection as $sKey)
 …
         switch($sClassName) {
             case 'active' :
                 $sOutputCode .=
+                $sOutputCode .=
+                '
                     <div class="' . $sClassName . '">
 …
                 ';
                 break;
             case 'notActive' :
                 $sOutputCode .=
+                $sOutputCode .=
+                '
                     <div class="' . $sClassName . '">
 …
             'enctype' => 'multipart/form-data',
         ),
         'inputs' => array (
+        'inputs' => array (
             'Name' => array(
                 'type' => 'text',
 …
                 'attrs' => array()
             ),
             'Script' => array(
+            'Script' => array(
                 'type' => 'text',
                 'name' => 'Script',
 …
                         'onclick' => 'javascript:saveItem(' . $aItem['ID'] . ');'
+                    )
                 ),
+                ),
                 array(
                     'type' => 'button',
 …
+                    )
+                )
             ),
+            ),
+        )
     );
     foreach($aForm['inputs'] as $sKey => $aInput)
         if(in_array($aInput['type'], array('text', 'checkbox')) && !$aItem['Editable'])
 …
     $oForm = new BxTemplFormView($aForm);
     return PopupBox('mmc_edit_popup', _t('_adm_mbuilder_edit_item')
+    return PopupBox('mmc_edit_popup', _t('_adm_mbuilder_edit_item')
             , $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html'
             , array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
 …
 /**
  * @description : function will create new menu items ;
  * @param       : $type (string) - type of ellement ;
  * @param       : $source (integer) - menu's ID;
  * @return      : ID of created menu item ;
+ * @param         : $type (string) - type of ellement ;
+ * @param         : $source (integer) - menu's ID;
+ * @return         : ID of created menu item ;
 */
 function createNewElement( $type, $source, $sMenuSection = 'top' ) {
     global $oMenu;
     if( $source ) {
         $sourceActive = db_value( "SELECT `Active` FROM `sys_menu_member` WHERE `ID`=$source" );
         if( !$sourceActive ) {
             //convert to active
             db_res( "UPDATE `sys_menu_member` SET `Active`='1', `Position`='$type' WHERE `ID`=$source" );
             $newID = $source;
         } else {
             //create from source
             db_res( "INSERT INTO `sys_menu_member`
                         ( `Name`, `Caption`, `Link`, `Target`, `Script`, `Position`, `Eval`, `Icon`, `Type`, `Bubble`, `Description`, `PopupMenu`)
                     SELECT
                           `Name`, `Caption`, `Link`, `Target`, `Script`, '$type', `Eval`, `Icon`, `Type`, `Bubble`, `Description`, `PopupMenu`
                     FROM `sys_menu_member`
                     WHERE `ID`=$source" );
             $newID = db_last_id();
+        }
     } else {
         //create new
         db_res( "INSERT INTO `sys_menu_member` ( `Name`, `Position` ) VALUES ( 'NEW ITEM', '$type' )" );
         $newID = db_last_id();
+    }
     return $newID;
+    global $oMenu;
+    if( $source ) {
+        $sourceActive = db_value( "SELECT `Active` FROM `sys_menu_member` WHERE `ID`=$source" );
+        if( !$sourceActive ) {
+            //convert to active
+            db_res( "UPDATE `sys_menu_member` SET `Active`='1', `Position`='$type' WHERE `ID`=$source" );
+            $newID = $source;
+        } else {
+            //create from source
+            db_res( "INSERT INTO `sys_menu_member`
+                        ( `Name`, `Caption`, `Link`, `Target`, `Script`, `Position`, `Eval`, `Icon`, `Type`, `Bubble`, `Description`, `PopupMenu`)
+                    SELECT
+                          `Name`, `Caption`, `Link`, `Target`, `Script`, '$type', `Eval`, `Icon`, `Type`, `Bubble`, `Description`, `PopupMenu`
+                    FROM `sys_menu_member`
+                    WHERE `ID`=$source" );
+            $newID = db_last_id();
+        }
+    } else {
+        //create new
+        db_res( "INSERT INTO `sys_menu_member` ( `Name`, `Position` ) VALUES ( 'NEW ITEM', '$type' )" );
+        $newID = db_last_id();
+    }
+    return $newID;
+}
 function echoMenuEditMsg( $text, $color = 'black' ) {
     return <<<HTML
         <div style="color:{$color};text-align:center;">{$text}</div>
+        <div style="color:{$color};text-align:center;">{$text}</div>
 HTML;
+}
 …
 /**
  * @description : function will save all changes into menu items ;
  * @param       : $id (integer) - ID of menu items ;
  * @param       : $aItem (array) - all needed POST variables ;
  * @param       : $sMenuSection (string) - position of menu ;
  * @return      : Html presentation data (Answer code);
+ * @param        : $id (integer) - ID of menu items ;
+ * @param        : $aItem (array) - all needed POST variables ;
+ * @param        : $sMenuSection (string) - position of menu ;
+ * @return        : Html presentation data (Answer code);
 */
 function saveItem( $id, $aItem, $sMenuSection ) {
     global $oMenu, $sMenuSection, $oMemeberMenu;
     $aOldItem = db_arr( "SELECT * FROM `sys_menu_member` WHERE `ID` = $id" );
     if(!$aOldItem) {
         return array( 'code' => 2, 'message' => _t('_adm_mbuilder_Item_not_found') );
+    }
     if( (int) $aOldItem['Editable'] != 1 ) {
         return array('code' => 3, 'message' => _t('_adm_mbuilder_Item_is_non_editable') );
+    }
     $sQuerySet = '';
     foreach( $aItem as $field => $value )
         $sQuerySet .= ", `$field`='" . process_db_input( $value ) ."'";
     $sQuerySet = substr( $sQuerySet, 1 );
     $sQuery = "UPDATE `sys_menu_member` SET $sQuerySet WHERE `ID` = $id";
     db_res( $sQuery );
+    global $oMenu, $sMenuSection, $oMemeberMenu;
+    $aOldItem = db_arr( "SELECT * FROM `sys_menu_member` WHERE `ID` = $id" );
+    if(!$aOldItem) {
+        return array( 'code' => 2, 'message' => _t('_adm_mbuilder_Item_not_found') );
+    }
+    if( (int) $aOldItem['Editable'] != 1 ) {
+        return array('code' => 3, 'message' => _t('_adm_mbuilder_Item_is_non_editable') );
+    }
+    $sQuerySet = '';
+    foreach( $aItem as $field => $value )
+        $sQuerySet .= ", `$field`='" . process_db_input( $value ) ."'";
+    $sQuerySet = substr( $sQuerySet, 1 );
+    $sQuery = "UPDATE `sys_menu_member` SET $sQuerySet WHERE `ID` = $id";
+    db_res( $sQuery );
     // return script's response and recompile the menu cache ;
     $oMemeberMenu -> createMemberMenuCache( $sMenuSection );
     return array('code' => 0, 'message' => _t('_Saved'), 'timer' => 3);
+    return array('code' => 0, 'message' => _t('_Saved'), 'timer' => 3);
+}
 function updateLangFile( $key, $string ) {
     // clear from special chars ;
     $key = preg_replace( '|\{([^\}]+)\}|', '', $key);
     $langName = getParam( 'lang_default' );
     $langID = db_value( "SELECT `ID` FROM `sys_localization_languages` WHERE `Name` = '" . addslashes( $langName ) . "'" );
     $keyID = db_value( "SELECT `ID` FROM `sys_localization_keys` WHERE `Key` = '" . process_db_input( $key ) . "'" );
     if( $keyID ) {
         db_res( "UPDATE `sys_localization_strings` SET `String` = '" .process_db_input( $string ) . "' WHERE `IDKey`=$keyID AND `IDLanguage`=$langID" );
     } else {
         db_res( "INSERT INTO `sys_localization_keys` SET `IDCategory` = 2, `Key` = '" . process_db_input( $key ) . "'" );
         db_res( "INSERT INTO `sys_localization_strings` SET `IDKey` = " . db_last_id() . ", `IDLanguage` = $langID, `String` = '" .process_db_input( $string ) . "'" );
+    }
     compileLanguage($langID);
+    // clear from special chars ;
+    $key = preg_replace( '|\{([^\}]+)\}|', '', $key);
+    $langName = getParam( 'lang_default' );
+    $langID = db_value( "SELECT `ID` FROM `sys_localization_languages` WHERE `Name` = '" . addslashes( $langName ) . "'" );
+    $keyID = db_value( "SELECT `ID` FROM `sys_localization_keys` WHERE `Key` = '" . process_db_input( $key ) . "'" );
+    if( $keyID ) {
+        db_res( "UPDATE `sys_localization_strings` SET `String` = '" .process_db_input( $string ) . "' WHERE `IDKey`=$keyID AND `IDLanguage`=$langID" );
+    } else {
+        db_res( "INSERT INTO `sys_localization_keys` SET `IDCategory` = 2, `Key` = '" . process_db_input( $key ) . "'" );
+        db_res( "INSERT INTO `sys_localization_strings` SET `IDKey` = " . db_last_id() . ", `IDLanguage` = $langID, `String` = '" .process_db_input( $string ) . "'" );
+    }
+    compileLanguage($langID);
+}
 /**
  * @description : function will save menu orders ;
  * @param       : $sTop ( string ) - current menu ellement ;
  * @param       : $aCustom ( array ) - all mrnu items ;
  * @param       : $sMenuSection (string) - position of menu ;
+ * @param        : $sTop ( string ) - current menu ellement ;
+ * @param        : $aCustom ( array ) - all mrnu items ;
+ * @param        : $sMenuSection (string) - position of menu ;
 */
 function saveOrders( $sTop, $aCustom, $sMenuSection ) {
     db_res( "UPDATE `sys_menu_member` SET `Order` = 0 WHERE `Position` = '{$sMenuSection}' " );
     $sTop = trim( $sTop, ' ,' );
     $aTopIDs = explode( ',', $sTop );
     foreach( $aTopIDs as $iOrd => $iID ) {
         $iID = trim( $iID, ' ,' );
         $iID = (int)$iID;
         if( !$iID )
             continue;
         db_res( "UPDATE `sys_menu_member` SET `Order` = $iOrd, `Position` = '{$sMenuSection}'  WHERE `ID` = $iID" );
+    }
+    db_res( "UPDATE `sys_menu_member` SET `Order` = 0 WHERE `Position` = '{$sMenuSection}' " );
+    $sTop = trim( $sTop, ' ,' );
+    $aTopIDs = explode( ',', $sTop );
+    foreach( $aTopIDs as $iOrd => $iID ) {
+        $iID = trim( $iID, ' ,' );
+        $iID = (int)$iID;
+        if( !$iID )
+            continue;
+        db_res( "UPDATE `sys_menu_member` SET `Order` = $iOrd, `Position` = '{$sMenuSection}'  WHERE `ID` = $iID" );
+    }
+}

trunk/administration/menu_compose_admin.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 if(bx_get('action') !== false) {
     switch(bx_get('action')) {
         case 'edit_form':
             $id = (int)bx_get('id');
             if( $id < 1000 ) {
                 $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$id}'", 0 );
                 if( $aItem )
                     echo showEditFormCustom( $aItem );
                 else
                     echo echoMenuEditMsg( _t('_Error'), 'red' );
             } else {
                 $id = $id - 1000;
                 $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$id}' AND `parent_id`='0'", 0 );
                 if( $aItem )
                     echo showEditFormTop( $aItem );
                 else
                     echo echoMenuEditMsg( _t('_Error'), 'red' );
+            }
             exit;
         case 'create_item':
             $newID = createNewElement($_POST['type'], (int)$_POST['source']);
             echo $newID;
             exit;
         case 'deactivate_item':
             $id = (int)bx_get('id');
             if( $id > 1000 ) {
                 $id = $id - 1000;
                 db_res( "DELETE FROM `sys_menu_admin` WHERE `id`='{$id}' AND `parent_id`='0'" );
                 echo db_affected_rows();
             } else
                 echo 1;
             exit;
         case 'save_item':
             $id = (int)$_POST['id'];
             if( !$id ) {
                 $aResult = array('code' => 1, 'message' => _t('_Error occured'));
             } else {
                 if( $id < 1000 ) {
                     $aItemFields = array( 'title', 'url', 'description', 'check', 'icon' );
                     $aItem = array();
                     foreach( $aItemFields as $field )
                         $aItem[$field] = $_POST[$field];
                 } else {
                     $id = $id - 1000;
                     $aItemFields = array( 'title', 'icon', 'icon_large' );
                     $aItem = array();
                     foreach( $aItemFields as $field )
                         $aItem[$field] = $_POST[$field];
+                }
                 $aResult = saveItem( $id, $aItem );
+            }
             $aResult['message'] = MsgBox($aResult['message']);
             $oJson = new Services_JSON();
+    switch(bx_get('action')) {
+        case 'edit_form':
+            $id = (int)bx_get('id');
+            if( $id < 1000 ) {
+                $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$id}'", 0 );
+                if( $aItem )
+                    echo showEditFormCustom( $aItem );
+                else
+                    echo echoMenuEditMsg( _t('_Error'), 'red' );
+            } else {
+                $id = $id - 1000;
+                $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$id}' AND `parent_id`='0'", 0 );
+                if( $aItem )
+                    echo showEditFormTop( $aItem );
+                else
+                    echo echoMenuEditMsg( _t('_Error'), 'red' );
+            }
+            exit;
+        case 'create_item':
+            $newID = createNewElement($_POST['type'], (int)$_POST['source']);
+            echo $newID;
+            exit;
+        case 'deactivate_item':
+            $id = (int)bx_get('id');
+            if( $id > 1000 ) {
+                $id = $id - 1000;
+                db_res( "DELETE FROM `sys_menu_admin` WHERE `id`='{$id}' AND `parent_id`='0'" );
+                echo db_affected_rows();
+            } else
+                echo 1;
+            exit;
+        case 'save_item':
+            $id = (int)$_POST['id'];
+            if( !$id ) {
+                $aResult = array('code' => 1, 'message' => _t('_Error occured'));
+            } else {
+                if( $id < 1000 ) {
+                    $aItemFields = array( 'title', 'url', 'description', 'check', 'icon' );
+                    $aItem = array();
+                    foreach( $aItemFields as $field )
+                        $aItem[$field] = $_POST[$field];
+                } else {
+                    $id = $id - 1000;
+                    $aItemFields = array( 'title', 'icon', 'icon_large' );
+                    $aItem = array();
+                    foreach( $aItemFields as $field )
+                        $aItem[$field] = $_POST[$field];
+                }
+                $aResult = saveItem( $id, $aItem );
+            }
+            $aResult['message'] = MsgBox($aResult['message']);
+            $oJson = new Services_JSON();
             echo $oJson->encode($aResult);
             exit;
         case 'delete_item':
             $id = (int)$_POST['id'];
             if( !$id ) {
                 echo _t('_adm_mbuilder_Item_ID_not_specified');
                 exit;
+            }
             if( $id > 1000 ) {
                 $id = $id - 1000;
                 db_res( "DELETE FROM `sys_menu_admin` WHERE `id` = '{$id}' AND `parent_id`='0'" );
             } else {
                 db_res( "DELETE FROM `sys_menu_admin` WHERE `id` = '{$id}'" );
+            }
             if( db_affected_rows() )
                 echo 'OK';
             else
                 echo _t('_adm_mbuilder_Could_not_delete_the_item');
             exit;
         case 'save_orders':
             saveOrders(bx_get('top'), bx_get('custom'));
             echo 'OK';
             exit;
+    }
+            exit;
+        case 'delete_item':
+            $id = (int)$_POST['id'];
+            if( !$id ) {
+                echo _t('_adm_mbuilder_Item_ID_not_specified');
+                exit;
+            }
+            if( $id > 1000 ) {
+                $id = $id - 1000;
+                db_res( "DELETE FROM `sys_menu_admin` WHERE `id` = '{$id}' AND `parent_id`='0'" );
+            } else {
+                db_res( "DELETE FROM `sys_menu_admin` WHERE `id` = '{$id}'" );
+            }
+            if( db_affected_rows() )
+                echo 'OK';
+            else
+                echo _t('_adm_mbuilder_Could_not_delete_the_item');
+            exit;
+        case 'save_orders':
+            saveOrders(bx_get('top'), bx_get('custom'));
+            echo 'OK';
+            exit;
+    }
+}
 …
 $sComposerInit = "
     <script type=\"text/javascript\">
         topParentID = 'menu_app_wrapper';
         urlIconLoading = '{$site['url_admin']}images/loading.gif';
         parserUrl = '" . $GLOBALS['site']['url_admin'] . "menu_compose_admin.php?';
         allowNewItem = true;
         allowAddToTop = true;
         allowAddToCustom = true;
         iInactivePerRow = 7;
         sendSystemOrder = false;
         aCoords = {};
         aCoords['startX'] = 270;
         aCoords['startY'] = 235;
         aCoords['width']  = 92;
         aCoords['height'] = 21;
         aCoords['diffX']  = 122;
         aCoords['diffY']  = 32;
         aTopItems = {};
         aCustomItems = {};
         aSystemItems = {};
         aAllItems = {};
+    <script type=\"text/javascript\">
+        topParentID = 'menu_app_wrapper';
+        urlIconLoading = '{$site['url_admin']}images/loading.gif';
+        parserUrl = '" . $GLOBALS['site']['url_admin'] . "menu_compose_admin.php?';
+        allowNewItem = true;
+        allowAddToTop = true;
+        allowAddToCustom = true;
+        iInactivePerRow = 7;
+        sendSystemOrder = false;
+        aCoords = {};
+        aCoords['startX'] = 270;
+        aCoords['startY'] = 235;
+        aCoords['width']  = 92;
+        aCoords['height'] = 21;
+        aCoords['diffX']  = 122;
+        aCoords['diffY']  = 32;
+        aTopItems = {};
+        aCustomItems = {};
+        aSystemItems = {};
+        aAllItems = {};
 ";
 $iIndex = 0;
 while(($aTopItem = mysql_fetch_assoc($rTopItems)) !== false) {
     $sTopestTitle = _t($aTopItem['title']);
     $sComposerInit .= "
         aTopItems[$iIndex] = [" . ($aTopItem['id'] + 1000) . ", '{$sTopestTitle}', 3];
         aCustomItems[$iIndex] = {};";
     $sQuery = "SELECT `id`, `title` FROM `sys_menu_admin` WHERE `parent_id`='{$aTopItem['id']}' ORDER BY `order`";
     $iSubIndex = 0;
     $rCustomItems = db_res( $sQuery );
     while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
         $sCustomTitle = _t($aCustomItem['title']);
         $sComposerInit .= "
         aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['id']}, '{$sCustomTitle}', 3];";
+    }
     $iIndex++;
+    $sTopestTitle = _t($aTopItem['title']);
+    $sComposerInit .= "
+        aTopItems[$iIndex] = [" . ($aTopItem['id'] + 1000) . ", '{$sTopestTitle}', 3];
+        aCustomItems[$iIndex] = {};";
+    $sQuery = "SELECT `id`, `title` FROM `sys_menu_admin` WHERE `parent_id`='{$aTopItem['id']}' ORDER BY `order`";
+    $iSubIndex = 0;
+    $rCustomItems = db_res( $sQuery );
+    while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
+        $sCustomTitle = _t($aCustomItem['title']);
+        $sComposerInit .= "
+        aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['id']}, '{$sCustomTitle}', 3];";
+    }
+    $iIndex++;
+}
 $sComposerInit .= "\n";
 while(($aAllTopItem = mysql_fetch_assoc($rAllTopItems)) !== false) {
     $sTopTitle = _t($aAllTopItem['title']);
     $sComposerInit .= "
         aAllItems[" . ($aAllTopItem['id'] + 1000) . "] = '{$sTopTitle}';";
+    $sTopTitle = _t($aAllTopItem['title']);
+    $sComposerInit .= "
+        aAllItems[" . ($aAllTopItem['id'] + 1000) . "] = '{$sTopTitle}';";
+}
 $sComposerInit .= "\n";
 while(($aAllItem = mysql_fetch_assoc($rAllItems)) !== false) {
     $sOrdTitle = _t($aAllItem['title']);
     $sComposerInit .= "
         aAllItems[{$aAllItem['id']}] = '{$sOrdTitle}';";
+    $sOrdTitle = _t($aAllItem['title']);
+    $sComposerInit .= "
+        aAllItems[{$aAllItem['id']}] = '{$sOrdTitle}';";
+}
 $sComposerInit .= "
     </script>
+    </script>
 ";
 …
 // Functions
 function getMainPageCode() {
     $sAdminUrl = BX_DOL_URL_ADMIN;
     $sAllItemsC = _t('_adm_mbuilder_All_Items');
     $sActiveItemsC = _t('_adm_mbuilder_Active_Items');
     return <<<EOF
     <div class="pseudo_wrapper">
         <div class="pseudo_head">{$sActiveItemsC}</div>
         <div id="pseudo1">
             <img src="{$sAdminUrl}images/loading.gif" />
         </div>
         <div class="pseudo_head">{$sAllItemsC}</div>
         <div id="pseudo2">
             <img src="{$sAdminUrl}images/loading.gif" />
         </div>
     </div>
+    $sAdminUrl = BX_DOL_URL_ADMIN;
+    $sAllItemsC = _t('_adm_mbuilder_All_Items');
+    $sActiveItemsC = _t('_adm_mbuilder_Active_Items');
+    return <<<EOF
+    <div class="pseudo_wrapper">
+        <div class="pseudo_head">{$sActiveItemsC}</div>
+        <div id="pseudo1">
+            <img src="{$sAdminUrl}images/loading.gif" />
+        </div>
+        <div class="pseudo_head">{$sAllItemsC}</div>
+        <div id="pseudo2">
+            <img src="{$sAdminUrl}images/loading.gif" />
+        </div>
+    </div>
 EOF;
+}
 …
             'enctype' => 'multipart/form-data',
         ),
         'inputs' => array (
+        'inputs' => array (
             'Title' => array(
                 'type' => 'text',
 …
                 'attrs' => array()
             ),
             'Check' => array(
+            'Check' => array(
                 'type' => 'text',
                 'name' => 'check',
 …
                         'onclick' => 'javascript:saveItem(' . $aItem['id'] . ');'
+                    )
                 ),
+                ),
                 array(
                     'type' => 'button',
 …
+                    )
+                )
             ),
+            ),
+        )
     );
     $oForm = new BxTemplFormView($aForm);
     return PopupBox('amc_edit_popup_custom', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+    return PopupBox('amc_edit_popup_custom', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+}
 …
             'enctype' => 'multipart/form-data',
         ),
         'inputs' => array (
+        'inputs' => array (
             'Title' => array(
                 'type' => 'text',
 …
+        )
     );
     $oForm = new BxTemplFormView($aForm);
     return PopupBox('amc_edit_popup_top', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+    return PopupBox('amc_edit_popup_top', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+}
 function createNewElement( $type, $source ) {
     if( $source ) {
         if( $type == 'top' and $source > 1000 ) {
             $source = $source - 1000;
             db_res( "
                 INSERT INTO `sys_menu_admin`
                     (`title`, `icon`, `icon_large`)
                 SELECT
                       `title`, `icon`, `icon_large`
                 FROM `sys_menu_admin`
                 WHERE `id` = '{$source}'
             " );
             $newID = db_last_id();
         } elseif( $type == 'custom' and $source < 1000 ) {
             $aItem = db_res( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$source}'" );
             if( $aItem['parent_id'] == 0 )
                 $newID = $source;
             else {
                 db_res( "
                     INSERT INTO `sys_menu_admin`
                         (`title`, `url`, `description`, `check`, `icon`)
                     SELECT
                           `title`, `url`, `description`, `check`, `icon`
                     FROM `sys_menu_admin`
                     WHERE `id` = '{$source}'
                 " );
                 $newID = db_last_id();
+            }
         } elseif( $type == 'custom' and $source > 1000 ) {
             $source = $source - 1000;
             db_res( "
                 INSERT INTO `sys_menu_admin`
                     (`title`)
                 SELECT
                       `title`
                 FROM `sys_menu_admin`
                 WHERE `id` = '{$source}'
             " );
             $newID = db_last_id();
         } elseif( $type == 'top' and $source < 1000 ) {
             db_res( "
                 INSERT INTO `sys_menu_admin`
                     (`title`)
                 SELECT
                       `title`
                 FROM `sys_menu_admin`
                 WHERE `id` = '{$source}'
             " );
             $newID = db_last_id();
+        }
     } else {
         db_res( "INSERT INTO `sys_menu_admin` SET `title` = 'NEW ITEM'" );
         $newID = db_last_id();
+    }
     return $newID;
+    if( $source ) {
+        if( $type == 'top' and $source > 1000 ) {
+            $source = $source - 1000;
+            db_res( "
+                INSERT INTO `sys_menu_admin`
+                    (`title`, `icon`, `icon_large`)
+                SELECT
+                      `title`, `icon`, `icon_large`
+                FROM `sys_menu_admin`
+                WHERE `id` = '{$source}'
+            " );
+            $newID = db_last_id();
+        } elseif( $type == 'custom' and $source < 1000 ) {
+            $aItem = db_res( "SELECT * FROM `sys_menu_admin` WHERE `id` = '{$source}'" );
+            if( $aItem['parent_id'] == 0 )
+                $newID = $source;
+            else {
+                db_res( "
+                    INSERT INTO `sys_menu_admin`
+                        (`title`, `url`, `description`, `check`, `icon`)
+                    SELECT
+                          `title`, `url`, `description`, `check`, `icon`
+                    FROM `sys_menu_admin`
+                    WHERE `id` = '{$source}'
+                " );
+                $newID = db_last_id();
+            }
+        } elseif( $type == 'custom' and $source > 1000 ) {
+            $source = $source - 1000;
+            db_res( "
+                INSERT INTO `sys_menu_admin`
+                    (`title`)
+                SELECT
+                      `title`
+                FROM `sys_menu_admin`
+                WHERE `id` = '{$source}'
+            " );
+            $newID = db_last_id();
+        } elseif( $type == 'top' and $source < 1000 ) {
+            db_res( "
+                INSERT INTO `sys_menu_admin`
+                    (`title`)
+                SELECT
+                      `title`
+                FROM `sys_menu_admin`
+                WHERE `id` = '{$source}'
+            " );
+            $newID = db_last_id();
+        }
+    } else {
+        db_res( "INSERT INTO `sys_menu_admin` SET `title` = 'NEW ITEM'" );
+        $newID = db_last_id();
+    }
+    return $newID;
+}
 function echoMenuEditMsg( $text, $color = 'black' ) {
     return <<<EOF
+    return <<<EOF
 <div onclick="hideEditForm();" style="color:{$color};text-align:center;">{$text}</div>
 EOF;
 …
 function saveItem( $id, $aItem ) {
     $sSavedC = _t('_Saved');
     $aOldItem = db_arr( "SELECT * FROM `sys_menu_admin` WHERE `id`='{$id}'" );
     if( !$aOldItem )
         return array('code' => 2, 'message' => _t('_Error') . ' ' . _t('_adm_mbuilder_Item_not_found'));
     $sQuerySet = '';
     foreach( $aItem as $field => $value )
         $sQuerySet .= ", `{$field}`='" . process_db_input( $value ) ."'";
     $sQuerySet = substr( $sQuerySet, 1 );
     $sQuery = "UPDATE `sys_menu_admin` SET {$sQuerySet} WHERE `id` = '{$id}'";
     db_res( $sQuery );
     return array('code' => 0, 'message' => $sSavedC, 'timer' => 3);
+    $sSavedC = _t('_Saved');
+    $aOldItem = db_arr( "SELECT * FROM `sys_menu_admin` WHERE `id`='{$id}'" );
+    if( !$aOldItem )
+        return array('code' => 2, 'message' => _t('_Error') . ' ' . _t('_adm_mbuilder_Item_not_found'));
+    $sQuerySet = '';
+    foreach( $aItem as $field => $value )
+        $sQuerySet .= ", `{$field}`='" . process_db_input( $value ) ."'";
+    $sQuerySet = substr( $sQuerySet, 1 );
+    $sQuery = "UPDATE `sys_menu_admin` SET {$sQuerySet} WHERE `id` = '{$id}'";
+    db_res( $sQuery );
+    return array('code' => 0, 'message' => $sSavedC, 'timer' => 3);
+}
 function saveOrders( $sTop, $aCustom ) {
     db_res( "UPDATE `sys_menu_admin` SET `order` = 0" );
     db_res( "UPDATE `sys_menu_admin` SET `order` = 0, `parent_id` = 0" );
     $sTop = trim( $sTop, ' ,' );
     $aTopIDs = explode( ',', $sTop );
     foreach( $aTopIDs as $iOrd => $iID ) {
         $iID = trim( $iID, ' ,' );
         $iID = (int)$iID;
         if( !$iID )
             continue;
         $iID = $iID - 1000;
         db_res( "UPDATE `sys_menu_admin` SET `order` = {$iOrd} WHERE `id` = '{$iID}'" );
+    }
     foreach( $aCustom as $iParent => $sCustom ) {
         $iParent = (int)$iParent;
         $iParent = $iParent - 1000;
         $sCustom = trim( $sCustom, ' ,' );
         $aCustomIDs = explode( ',', $sCustom );
         foreach( $aCustomIDs as $iOrd => $iID ) {
             $iID = trim( $iID, ' ,' );
             $iID = (int)$iID;
             if( !$iID )
                 continue;
             db_res( "UPDATE `sys_menu_admin` SET `order` = '{$iOrd}', `parent_id`='{$iParent}' WHERE `id` = '{$iID}'" );
+        }
+    }
+    db_res( "UPDATE `sys_menu_admin` SET `order` = 0" );
+    db_res( "UPDATE `sys_menu_admin` SET `order` = 0, `parent_id` = 0" );
+    $sTop = trim( $sTop, ' ,' );
+    $aTopIDs = explode( ',', $sTop );
+    foreach( $aTopIDs as $iOrd => $iID ) {
+        $iID = trim( $iID, ' ,' );
+        $iID = (int)$iID;
+        if( !$iID )
+            continue;
+        $iID = $iID - 1000;
+        db_res( "UPDATE `sys_menu_admin` SET `order` = {$iOrd} WHERE `id` = '{$iID}'" );
+    }
+    foreach( $aCustom as $iParent => $sCustom ) {
+        $iParent = (int)$iParent;
+        $iParent = $iParent - 1000;
+        $sCustom = trim( $sCustom, ' ,' );
+        $aCustomIDs = explode( ',', $sCustom );
+        foreach( $aCustomIDs as $iOrd => $iID ) {
+            $iID = trim( $iID, ' ,' );
+            $iID = (int)$iID;
+            if( !$iID )
+                continue;
+            db_res( "UPDATE `sys_menu_admin` SET `order` = '{$iOrd}', `parent_id`='{$iParent}' WHERE `id` = '{$iID}'" );
+        }
+    }
+}

trunk/administration/modules.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
     'page_code_updates' => DesignBoxAdmin(_t('_adm_box_cpt_available_updates'), $oInstallerUi->getUpdates($sResultDeleteUpdate)),
     'page_code_market_feed' => 'on' == getParam('feeds_enable') ? DesignBoxAdmin(_t('_adm_box_cpt_featured_modules'), '
         <div class="RSSAggrCont" rssid="boonex_unity_market_featured" rssnum="5" member="0">
             <div class="loading_rss">
                 <img src="' . getTemplateImage('loading.gif') . '" alt="'._t('_loading ...').'" />
             </div>
          </div>') : '',
+        <div class="RSSAggrCont" rssid="boonex_unity_market_featured" rssnum="5" member="0">
+            <div class="loading_rss">
+                <img src="' . getTemplateImage('loading.gif') . '" alt="'._t('_loading ...').'" />
+            </div>
+         </div>') : '',
 );

trunk/administration/nav_menu_compose.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $GLOBALS['oAdmTemplate']->addJsTranslation(array(
     '_adm_mbuilder_Sorry_could_not_insert_object',
     '_adm_mbuilder_This_items_are_non_editable'
+    '_adm_mbuilder_Sorry_could_not_insert_object',
+    '_adm_mbuilder_This_items_are_non_editable'
 ));
 …
 if(bx_get('action') !== false) {
     switch(bx_get('action')) {
         case 'edit_form':
             $id = (int)bx_get('id');
             $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_top` WHERE `ID` = '{$id}'", 0 );
             if( $aItem )
                 echo showEditForm( $aItem );
             else
                 echoMenuEditMsg( _t('_Error occured'), 'red' );
         exit;
         case 'create_item':
             $newID = createNewElement($_POST['type'], (int)$_POST['source']);
             echo $newID;
         exit;
         case 'deactivate_item':
             $res = db_res( "UPDATE `sys_menu_top` SET `Active`=0 WHERE `ID`=" . (int)bx_get('id'));
             echo db_affected_rows();
             $oMenu -> compile();
         exit;
         case 'save_item':
             $id = (int)$_POST['id'];
             if(!$id)
                 $aResult = array('code' => 1, 'message' => _t('_Error occured'));
             else {
                 $aItemFields = array('Name', 'Caption', 'Link', 'Picture', 'Icon');
                 $aItem = array();
                 foreach( $aItemFields as $field )
                     $aItem[$field] = $_POST[$field];
                 $aVis = array();
                 if( (int)$_POST['Visible_non'] )
                     $aVis[] = 'non';
                 if( (int)$_POST['Visible_memb'] )
                     $aVis[] = 'memb';
                 $aItem['Visible'] = implode( ',', $aVis );
                 $aItem['BQuickLink'] = (int)$_POST['BInQuickLink'] ? '1' : '0';
                 $aItem['Target'] = $_POST['Target'] == '_blank' ? '_blank' : '';
+    switch(bx_get('action')) {
+        case 'edit_form':
+            $id = (int)bx_get('id');
+            $aItem = db_assoc_arr( "SELECT * FROM `sys_menu_top` WHERE `ID` = '{$id}'", 0 );
+            if( $aItem )
+                echo showEditForm( $aItem );
+            else
+                echoMenuEditMsg( _t('_Error occured'), 'red' );
+        exit;
+        case 'create_item':
+            $newID = createNewElement($_POST['type'], (int)$_POST['source']);
+            echo $newID;
+        exit;
+        case 'deactivate_item':
+            $res = db_res( "UPDATE `sys_menu_top` SET `Active`=0 WHERE `ID`=" . (int)bx_get('id'));
+            echo db_affected_rows();
+            $oMenu -> compile();
+        exit;
+        case 'save_item':
+            $id = (int)$_POST['id'];
+            if(!$id)
+                $aResult = array('code' => 1, 'message' => _t('_Error occured'));
+            else {
+                $aItemFields = array('Name', 'Caption', 'Link', 'Picture', 'Icon');
+                $aItem = array();
+                foreach( $aItemFields as $field )
+                    $aItem[$field] = $_POST[$field];
+                $aVis = array();
+                if( (int)$_POST['Visible_non'] )
+                    $aVis[] = 'non';
+                if( (int)$_POST['Visible_memb'] )
+                    $aVis[] = 'memb';
+                $aItem['Visible'] = implode( ',', $aVis );
+                $aItem['BQuickLink'] = (int)$_POST['BInQuickLink'] ? '1' : '0';
+                $aItem['Target'] = $_POST['Target'] == '_blank' ? '_blank' : '';
                 $aResult = saveItem( $id, $aItem );
+            }
             $aResult['message'] = MsgBox($aResult['message']);
+            $oJson = new Services_JSON();
+            }
+            $aResult['message'] = MsgBox($aResult['message']);
+            $oJson = new Services_JSON();
             echo $oJson->encode($aResult);
         exit;
         case 'delete_item':
             $id = (int)$_POST['id'];
             if( !$id ) {
                 echo _t('_adm_mbuilder_Item_ID_not_specified');
                 exit;
+            }
             $aItem = db_arr( "SELECT `Deletable` FROM `sys_menu_top` WHERE `ID` = '{$id}'" );
             if( !$aItem ) {
                 echo _t('_adm_mbuilder_Item_not_found');
                 exit;
+            }
             if( !(int)$aItem['Deletable'] ) {
                 echo _t('_adm_mbuilder_Item_is_non_deletable');
                 exit;
+            }
             db_res( "DELETE FROM `sys_menu_top` WHERE `ID` = $id" );
             if( db_affected_rows() )
                 echo 'OK';
             else
                 echo _t('_adm_mbuilder_Could_not_delete_the_item');
             $oMenu -> compile();
         exit;
         case 'save_orders':
             saveOrders(bx_get('top'), bx_get('custom'));
             echo 'OK';
         exit;
+    }
+        exit;
+        case 'delete_item':
+            $id = (int)$_POST['id'];
+            if( !$id ) {
+                echo _t('_adm_mbuilder_Item_ID_not_specified');
+                exit;
+            }
+            $aItem = db_arr( "SELECT `Deletable` FROM `sys_menu_top` WHERE `ID` = '{$id}'" );
+            if( !$aItem ) {
+                echo _t('_adm_mbuilder_Item_not_found');
+                exit;
+            }
+            if( !(int)$aItem['Deletable'] ) {
+                echo _t('_adm_mbuilder_Item_is_non_deletable');
+                exit;
+            }
+            db_res( "DELETE FROM `sys_menu_top` WHERE `ID` = $id" );
+            if( db_affected_rows() )
+                echo 'OK';
+            else
+                echo _t('_adm_mbuilder_Could_not_delete_the_item');
+            $oMenu -> compile();
+        exit;
+        case 'save_orders':
+            saveOrders(bx_get('top'), bx_get('custom'));
+            echo 'OK';
+        exit;
+    }
+}
 …
 $sComposerInit = "
     <script type=\"text/javascript\">
     <!--
         topParentID = 'menu_app_wrapper';
         urlIconLoading = '{$sAdminUrl}images/loading.gif';
         parserUrl = '" . $GLOBALS['site']['url_admin'] . "nav_menu_compose.php?';
         allowNewItem = true;
         allowAddToTop = true;
         allowAddToCustom = true;
         iInactivePerRow = 7;
         sendSystemOrder = false;
         aCoords = {};
         aCoords['startX'] = 270;
         aCoords['startY'] = 235;
         aCoords['width']  = 92;
         aCoords['height'] = 21;
         aCoords['diffX']  = 122;
         aCoords['diffY']  = 32;
         aTopItems = {};
         aCustomItems = {};
         aSystemItems = {};
         aAllItems = {};
+    <script type=\"text/javascript\">
+    <!--
+        topParentID = 'menu_app_wrapper';
+        urlIconLoading = '{$sAdminUrl}images/loading.gif';
+        parserUrl = '" . $GLOBALS['site']['url_admin'] . "nav_menu_compose.php?';
+        allowNewItem = true;
+        allowAddToTop = true;
+        allowAddToCustom = true;
+        iInactivePerRow = 7;
+        sendSystemOrder = false;
+        aCoords = {};
+        aCoords['startX'] = 270;
+        aCoords['startY'] = 235;
+        aCoords['width']  = 92;
+        aCoords['height'] = 21;
+        aCoords['diffX']  = 122;
+        aCoords['diffY']  = 32;
+        aTopItems = {};
+        aCustomItems = {};
+        aSystemItems = {};
+        aAllItems = {};
 ";
 $iIndex = 0;
 while(($aTopItem = mysql_fetch_assoc($rTopItems)) !== false) {
     $sComposerInit .= "
         aTopItems[$iIndex] = [{$aTopItem['ID']}, '" . addslashes( $aTopItem['Name'] ) . "', " . $aTopItem['Movable'] . "];
         aCustomItems[$iIndex] = {};";
     $sQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_top` WHERE `Active`=1 AND `Type`='custom' AND `Parent`={$aTopItem['ID']} ORDER BY `Order`";
     $iSubIndex = 0;
     $rCustomItems = db_res( $sQuery );
     while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
         $sComposerInit .= "
         aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['ID']}, '" . addslashes( $aCustomItem['Name'] ) . "', " . $aCustomItem['Movable'] . "];";
+    }
     $iIndex++;
+    $sComposerInit .= "
+        aTopItems[$iIndex] = [{$aTopItem['ID']}, '" . addslashes( $aTopItem['Name'] ) . "', " . $aTopItem['Movable'] . "];
+        aCustomItems[$iIndex] = {};";
+    $sQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_top` WHERE `Active`=1 AND `Type`='custom' AND `Parent`={$aTopItem['ID']} ORDER BY `Order`";
+    $iSubIndex = 0;
+    $rCustomItems = db_res( $sQuery );
+    while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
+        $sComposerInit .= "
+        aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['ID']}, '" . addslashes( $aCustomItem['Name'] ) . "', " . $aCustomItem['Movable'] . "];";
+    }
+    $iIndex++;
+}
 while(($aSystemItem = mysql_fetch_assoc($rSysItems)) !== false) {
     $sComposerInit .= "
         aSystemItems[$iIndex] = [{$aSystemItem['ID']}, '" . addslashes( $aSystemItem['Name'] ) . "', " . $aSystemItem['Movable'] . "];
         aCustomItems[$iIndex] = {};";
     $sQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_top` WHERE `Active`=1 AND `Type`='custom' AND `Parent`={$aSystemItem['ID']} ORDER BY `Order`";
     $iSubIndex = 0;
     $rCustomItems = db_res( $sQuery );
     while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
         $sComposerInit .= "
         aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['ID']}, '" . addslashes( $aCustomItem['Name'] ) . "', " . $aCustomItem['Movable'] . "];";
+    }
     $iIndex++;
+    $sComposerInit .= "
+        aSystemItems[$iIndex] = [{$aSystemItem['ID']}, '" . addslashes( $aSystemItem['Name'] ) . "', " . $aSystemItem['Movable'] . "];
+        aCustomItems[$iIndex] = {};";
+    $sQuery = "SELECT `ID`, `Name`, `Movable` FROM `sys_menu_top` WHERE `Active`=1 AND `Type`='custom' AND `Parent`={$aSystemItem['ID']} ORDER BY `Order`";
+    $iSubIndex = 0;
+    $rCustomItems = db_res( $sQuery );
+    while(($aCustomItem = mysql_fetch_assoc($rCustomItems)) !== false) {
+        $sComposerInit .= "
+        aCustomItems[$iIndex][" . ($iSubIndex++) . "] = [{$aCustomItem['ID']}, '" . addslashes( $aCustomItem['Name'] ) . "', " . $aCustomItem['Movable'] . "];";
+    }
+    $iIndex++;
+}
 $sComposerInit .= "\n";
 while(($aAllItem = mysql_fetch_assoc($rAllItems)) !== false) {
     $sComposerInit .= "
         aAllItems[{$aAllItem['ID']}] = '" . addslashes( $aAllItem['Name'] ) . "';";
+    $sComposerInit .= "
+        aAllItems[{$aAllItem['ID']}] = '" . addslashes( $aAllItem['Name'] ) . "';";
+}
 $sComposerInit .= "
     -->
     </script>";
+    -->
+    </script>";
 $iNameIndex = 12;
 …
             'enctype' => 'multipart/form-data',
         ),
         'inputs' => array (
+        'inputs' => array (
             'Name' => array(
                 'type' => 'text',
 …
                 'value' => $aItem['Link'],
                 'attrs' => array()
             ),
+            ),
             'Picture' => array(
                 'type' => 'text',
 …
                         'onclick' => 'javascript:saveItem(' . $aItem['ID'] . ');'
+                    )
                 ),
+                ),
                 array(
                     'type' => 'button',
 …
+                    )
+                )
             ),
+            ),
+        )
     );
     foreach($aForm['inputs'] as $sKey => $aInput)
         if(in_array($aInput['type'], array('text', 'checkbox')) && !$aItem['Editable'])
 …
     $oForm = new BxTemplFormView($aForm);
     return PopupBox('tmc_edit_popup', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+    return PopupBox('tmc_edit_popup', _t('_adm_mbuilder_edit_item'), $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => $oForm->getCode() . LoadingBox('formItemEditLoading'))));
+}
 function createNewElement( $type, $source ) {
     global $oMenu;
     if( $source ) {
         $sourceActive = db_value( "SELECT `Active` FROM `sys_menu_top` WHERE `ID`='{$source}'" );
         if( !$sourceActive ) {
             //convert to active
             db_res( "UPDATE `sys_menu_top` SET `Active`=1, `Type`='{$type}' WHERE `ID`='{$source}'" );
             $newID = $source;
         } else {
             //create from source
             db_res( "INSERT INTO `sys_menu_top`
                         ( `Name`, `Caption`, `Link`, `Visible`, `Target`, `Onclick`, `Check`, `Type` )
                     SELECT
                           `Name`, `Caption`, `Link`, `Visible`, `Target`, `Onclick`, `Check`, '{$type}'
                     FROM `sys_menu_top`
                     WHERE `ID`='{$source}'" );
             $newID = db_last_id();
+        }
     } else {
         //create new
         db_res( "INSERT INTO `sys_menu_top` ( `Name`, `Type` ) VALUES ( 'NEW ITEM', '{$type}' )" );
         $newID = db_last_id();
+    }
     $oMenu -> compile();
     return $newID;
+    global $oMenu;
+    if( $source ) {
+        $sourceActive = db_value( "SELECT `Active` FROM `sys_menu_top` WHERE `ID`='{$source}'" );
+        if( !$sourceActive ) {
+            //convert to active
+            db_res( "UPDATE `sys_menu_top` SET `Active`=1, `Type`='{$type}' WHERE `ID`='{$source}'" );
+            $newID = $source;
+        } else {
+            //create from source
+            db_res( "INSERT INTO `sys_menu_top`
+                        ( `Name`, `Caption`, `Link`, `Visible`, `Target`, `Onclick`, `Check`, `Type` )
+                    SELECT
+                          `Name`, `Caption`, `Link`, `Visible`, `Target`, `Onclick`, `Check`, '{$type}'
+                    FROM `sys_menu_top`
+                    WHERE `ID`='{$source}'" );
+            $newID = db_last_id();
+        }
+    } else {
+        //create new
+        db_res( "INSERT INTO `sys_menu_top` ( `Name`, `Type` ) VALUES ( 'NEW ITEM', '{$type}' )" );
+        $newID = db_last_id();
+    }
+    $oMenu -> compile();
+    return $newID;
+}
 function echoMenuEditMsg( $text, $color = 'black' ) {
     echo <<<EOF
+    echo <<<EOF
 <div onclick="hideEditForm();" style="color:{$color};text-align:center;">{$text}</div>
 <script type="text/javascript">setTimeout( 'hideEditForm();', 1000 )</script>
 …
 function saveItem( $id, $aItem ) {
     global $oMenu;
     $sSavedC = _t('_Saved');
     $sItemNotFoundC = _t('_adm_mbuilder_Item_not_found');
     $sItemNonEditableC = _t('_adm_mbuilder_Item_is_non_editable');
     $aOldItem = db_arr( "SELECT * FROM `sys_menu_top` WHERE `ID`='{$id}'" );
     if(!$aOldItem)
         return array('code' => 2, 'message' => $sItemNotFoundC);
     if((int)$aOldItem['Editable'] != 1)
         return array('code' => 3, 'message' => $sItemNonEditableC);
     $sQuerySet = '';
     foreach( $aItem as $field => $value )
         $sQuerySet .= ", `{$field}`='" . process_db_input( $value ) ."'";
     $sQuerySet = substr( $sQuerySet, 1 );
     $sQuery = "UPDATE `sys_menu_top` SET {$sQuerySet} WHERE `ID` = '{$id}'";
     db_res( $sQuery );
     $oMenu -> compile();
     return array('code' => 0, 'message' => $sSavedC, 'timer' => 3);
+    global $oMenu;
+    $sSavedC = _t('_Saved');
+    $sItemNotFoundC = _t('_adm_mbuilder_Item_not_found');
+    $sItemNonEditableC = _t('_adm_mbuilder_Item_is_non_editable');
+    $aOldItem = db_arr( "SELECT * FROM `sys_menu_top` WHERE `ID`='{$id}'" );
+    if(!$aOldItem)
+        return array('code' => 2, 'message' => $sItemNotFoundC);
+    if((int)$aOldItem['Editable'] != 1)
+        return array('code' => 3, 'message' => $sItemNonEditableC);
+    $sQuerySet = '';
+    foreach( $aItem as $field => $value )
+        $sQuerySet .= ", `{$field}`='" . process_db_input( $value ) ."'";
+    $sQuerySet = substr( $sQuerySet, 1 );
+    $sQuery = "UPDATE `sys_menu_top` SET {$sQuerySet} WHERE `ID` = '{$id}'";
+    db_res( $sQuery );
+    $oMenu -> compile();
+    return array('code' => 0, 'message' => $sSavedC, 'timer' => 3);
+}
 function updateLangFile( $key, $string ) {
     $langName = getParam( 'lang_default' );
     $langID = db_value( "SELECT `ID` FROM `sys_localization_languages` WHERE `Name` = '" . addslashes( $langName ) . "'" );
     $keyID = db_value( "SELECT `ID` FROM `sys_localization_keys` WHERE `Key` = '" . process_db_input( $key ) . "'" );
     if( $keyID ) {
         db_res( "UPDATE `sys_localization_strings` SET `String` = '" .process_db_input( $string ) . "' WHERE `IDKey`='{$keyID}' AND `IDLanguage`='{$langID}'" );
     } else {
         db_res( "INSERT INTO `sys_localization_keys` SET `IDCategory` = 2, `Key` = '" . process_db_input( $key ) . "'" );
         db_res( "INSERT INTO `sys_localization_strings` SET `IDKey` = " . db_last_id() . ", `IDLanguage` = '{$langID}', `String` = '" .process_db_input( $string ) . "'" );
+    }
     compileLanguage($langID);
+    $langName = getParam( 'lang_default' );
+    $langID = db_value( "SELECT `ID` FROM `sys_localization_languages` WHERE `Name` = '" . addslashes( $langName ) . "'" );
+    $keyID = db_value( "SELECT `ID` FROM `sys_localization_keys` WHERE `Key` = '" . process_db_input( $key ) . "'" );
+    if( $keyID ) {
+        db_res( "UPDATE `sys_localization_strings` SET `String` = '" .process_db_input( $string ) . "' WHERE `IDKey`='{$keyID}' AND `IDLanguage`='{$langID}'" );
+    } else {
+        db_res( "INSERT INTO `sys_localization_keys` SET `IDCategory` = 2, `Key` = '" . process_db_input( $key ) . "'" );
+        db_res( "INSERT INTO `sys_localization_strings` SET `IDKey` = " . db_last_id() . ", `IDLanguage` = '{$langID}', `String` = '" .process_db_input( $string ) . "'" );
+    }
+    compileLanguage($langID);
+}
 function saveOrders( $sTop, $aCustom ) {
     global $oMenu;
     db_res( "UPDATE `sys_menu_top` SET `Order` = 0, `Parent` = 0" );
     $sTop = trim( $sTop, ' ,' );
     $aTopIDs = explode( ',', $sTop );
     foreach( $aTopIDs as $iOrd => $iID ) {
         $iID = trim( $iID, ' ,' );
         $iID = (int)$iID;
         if( !$iID )
             continue;
         db_res( "UPDATE `sys_menu_top` SET `Order` = '{$iOrd}', `Type` = 'top' WHERE `ID` = '{$iID}'" );
+    }
     foreach( $aCustom as $iParent => $sCustom ) {
         $iParent = (int)$iParent;
         $sCustom = trim( $sCustom, ' ,' );
         $aCustomIDs = explode( ',', $sCustom );
         foreach( $aCustomIDs as $iOrd => $iID ) {
             $iID = trim( $iID, ' ,' );
             $iID = (int)$iID;
             if( !$iID )
                 continue;
             db_res( "UPDATE `sys_menu_top` SET `Order` = '{$iOrd}', `Type` = 'custom', `Parent`='{$iParent}' WHERE `ID` = '{$iID}'" );
+        }
+    }
     $oMenu -> compile();
+    global $oMenu;
+    db_res( "UPDATE `sys_menu_top` SET `Order` = 0, `Parent` = 0" );
+    $sTop = trim( $sTop, ' ,' );
+    $aTopIDs = explode( ',', $sTop );
+    foreach( $aTopIDs as $iOrd => $iID ) {
+        $iID = trim( $iID, ' ,' );
+        $iID = (int)$iID;
+        if( !$iID )
+            continue;
+        db_res( "UPDATE `sys_menu_top` SET `Order` = '{$iOrd}', `Type` = 'top' WHERE `ID` = '{$iID}'" );
+    }
+    foreach( $aCustom as $iParent => $sCustom ) {
+        $iParent = (int)$iParent;
+        $sCustom = trim( $sCustom, ' ,' );
+        $aCustomIDs = explode( ',', $sCustom );
+        foreach( $aCustomIDs as $iOrd => $iID ) {
+            $iID = trim( $iID, ' ,' );
+            $iID = (int)$iID;
+            if( !$iID )
+                continue;
+            db_res( "UPDATE `sys_menu_top` SET `Order` = '{$iOrd}', `Type` = 'custom', `Parent`='{$iParent}' WHERE `ID` = '{$iID}'" );
+        }
+    }
+    $oMenu -> compile();
+}

trunk/administration/notifies.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $logged['admin'] = member_auth(1, true, true);
 if($_POST['queue_message'] && $_POST['msgs_id'])
     $sActionResult = QueueMessage();
+if($_POST['queue_message'] && $_POST['msgs_id'])
+    $sActionResult = QueueMessage();
 if ($_POST['add_message'])
     $action = 'add';
+    $action = 'add';
 if($_POST['delete_message'] && $_POST['msgs_id'])
     $sActionResult = DeleteMessage() ? _t('_adm_mmail_Message_was_deleted') : _t('_adm_mmail_Message_was_not_deleted');
 if($_POST['preview_message'] && $_POST['msgs_id'])
     $action = 'preview';
+    $action = 'preview';
 if(bx_get('action') == 'empty' )
     $sActionResult = EmptyQueue() ? _t('_adm_mmail_Queue_empty') : _t('_adm_mmail_Queue_emptying_failed');
 …
 );
 $_page_cont[$iNameIndex] = array(
+$_page_cont[$iNameIndex] = array(
     'page_code_status' => PrintStatus($sActionResult),
     'page_code_new_message' => getEmailMessage($action),
 …
 function PrintStatus($sActionResult) {
     $sSubjC = _t('_Subject');
     $sEmailsC = _t('_adm_mmail_emails');
     $sEmptyQueueC = _t('_adm_mmail_Empty_Queue');
     $sCupidStatusC = _t('_adm_mmail_Cupid_mails_status');
     $sSingleEmailsTRs = '';
+    // Select count of emails in queue per one message
     $iCount = (int)$GLOBALS['MySQL']->getOne("SELECT COUNT(`id`) AS `count` FROM `sys_sbs_queue`");
     if ($iCount <= 0)
         $sSingleEmailsTRs .= "<tr><td align=center><b><font color=red>" . _t('_adm_mmail_no_emails_in_queue') . "</font></b></td></tr>";
     else
+       $sSingleEmailsTRs .= "<tr><td align=center>" . _t('_adm_mmail_mails_in_queue', $iCount) . "</td></tr>";
     $sEmptyQueueTable = '';
     // If queue is not empty then show link to clear it
     if($iCount > 0) {
         $sEmptyQueueTable = "<hr>
         <table class=\"text\" width=\"50%\" style=\"height: 30px;\">
             <tr class=\"table\">
                 <td align=\"center\" colspan=\"3\">
                     <a href=\"" . BX_DOL_URL_ADMIN . "notifies.php?action=empty\">{$sEmptyQueueC}</a>
                 </td>
             </tr>
         </table>
         <hr>";
+    }
+    $sSubjC = _t('_Subject');
+    $sEmailsC = _t('_adm_mmail_emails');
+    $sEmptyQueueC = _t('_adm_mmail_Empty_Queue');
+    $sCupidStatusC = _t('_adm_mmail_Cupid_mails_status');
+    $sSingleEmailsTRs = '';
+    // Select count of emails in queue per one message
+    $iCount = (int)$GLOBALS['MySQL']->getOne("SELECT COUNT(`id`) AS `count` FROM `sys_sbs_queue`");
+    if ($iCount <= 0)
+        $sSingleEmailsTRs .= "<tr><td align=center><b><font color=red>" . _t('_adm_mmail_no_emails_in_queue') . "</font></b></td></tr>";
+    else
+       $sSingleEmailsTRs .= "<tr><td align=center>" . _t('_adm_mmail_mails_in_queue', $iCount) . "</td></tr>";
+    $sEmptyQueueTable = '';
+    // If queue is not empty then show link to clear it
+    if($iCount > 0) {
+        $sEmptyQueueTable = "<hr>
+        <table class=\"text\" width=\"50%\" style=\"height: 30px;\">
+            <tr class=\"table\">
+                <td align=\"center\" colspan=\"3\">
+                    <a href=\"" . BX_DOL_URL_ADMIN . "notifies.php?action=empty\">{$sEmptyQueueC}</a>
+                </td>
+            </tr>
+        </table>
+        <hr>";
+    }
     ob_start();
 …
 <div style="margin:9px;">
     <center>
         <table cellspacing=2 cellpadding=2 class=text border=0>
             <tr class=header align="center"><td><?=_t('_adm_mmail_Queue_status');?>:</td></tr>
             <?=$sSingleEmailsTRs;?>
         </table>
         <?=$sEmptyQueueTable;?>
+        <table cellspacing=2 cellpadding=2 class=text border=0>
+            <tr class=header align="center"><td><?=_t('_adm_mmail_Queue_status');?>:</td></tr>
+            <?=$sSingleEmailsTRs;?>
+        </table>
+        <?=$sEmptyQueueTable;?>
     </center>
 </div>
 …
     $sResult = ob_get_clean();
     if(!empty($sActionResult))
        $sResult = MsgBox($sActionResult, 3) . $sResult;
     return DesignBoxContent(_t('_Status'), $sResult, 1);
+    if(!empty($sActionResult))
+       $sResult = MsgBox($sActionResult, 3) . $sResult;
+    return DesignBoxContent(_t('_Status'), $sResult, 1);
+}
 function getAllMessagesBox() {
     $aMessages = $GLOBALS['MySQL']->getAll("SELECT `id`, `subject`, (`id`=". (int)$_POST['msgs_id'] ." OR `subject`='". process_db_input($_POST['Subj']) ."' ) AS `selected` FROM `sys_sbs_messages`");
     $sAllMessagesOptions = '';
     foreach($aMessages as $aMessage)
         $sAllMessagesOptions .= "<option value=\"" . $aMessage['id'] . "\" " . ($aMessage['selected'] ? "selected=\"selected\"" : "") . ">" . $aMessage['subject'] . "</option>";
+    $aMessages = $GLOBALS['MySQL']->getAll("SELECT `id`, `subject`, (`id`=". (int)$_POST['msgs_id'] ." OR `subject`='". process_db_input($_POST['Subj']) ."' ) AS `selected` FROM `sys_sbs_messages`");
+    $sAllMessagesOptions = '';
+    foreach($aMessages as $aMessage)
+        $sAllMessagesOptions .= "<option value=\"" . $aMessage['id'] . "\" " . ($aMessage['selected'] ? "selected=\"selected\"" : "") . ">" . $aMessage['subject'] . "</option>";
     ob_start();
 ?>
 <form name="form_messages" method="POST" action="<?=$GLOBALS['site']['url_admin'] . 'notifies.php';?>">
     <input type="hidden" name="action" value="view">
     <center class="text"><?= _t('_Messages'); ?>:&nbsp;
         <select name=msgs_id onChange="javascript: document.forms['form_messages'].submit();">
             <option value=0><?=_t('_None');?></option>
             <?=$sAllMessagesOptions;?>
         </select>
     </center>
+    <input type="hidden" name="action" value="view">
+    <center class="text"><?= _t('_Messages'); ?>:&nbsp;
+        <select name=msgs_id onChange="javascript: document.forms['form_messages'].submit();">
+            <option value=0><?=_t('_None');?></option>
+            <?=$sAllMessagesOptions;?>
+        </select>
+    </center>
 </form>
 <?
     $sResult = ob_get_clean();
     return DesignBoxContent(_t('_adm_mmail_All_Messages'), '<div style="margin:9px;">' . $sResult . '</div>', 1);
+    return DesignBoxContent(_t('_adm_mmail_All_Messages'), '<div style="margin:9px;">' . $sResult . '</div>', 1);
+}
 function getEmailMessage($sAction) {
     $sErrorC = _t('_Error Occured');
     $sApplyChangesC = _t('_Submit');
     $sSubjectC = _t('_Subject');
     $sBodyC = _t('_adm_mmail_Body');
     $sTextBodyC = _t('_adm_mmail_Text_email_body');
     $sPreviewMessageC = _t('_Preview');
     $sDeleteC = _t('_Delete');
     $sMessageID = (int)$_POST['msgs_id'];
     $sSubject = $sBody = "";
     if($_POST['body'] && $_POST['action'] != 'delete' ) {
         $sSubject = process_pass_data( $_POST['subject'] );
+        $sBody = process_pass_data( $_POST['body'] );
     } elseif ( $sMessageID )
         list($sSubject, $sBody) = $GLOBALS['MySQL']->getRow("SELECT `subject`, `body` FROM `sys_sbs_messages` WHERE `id`='". $sMessageID . "' LIMIT 1", MYSQL_NUM);
+    $sSubject = htmlspecialchars($sSubject);
     $aForm = array(
         'form_attrs' => array(
             'name' => 'sys_sbs_messages',
             'action' => $GLOBALS['site']['url_admin'] . 'notifies.php',
             'method' => 'post',
         ),
         'params' => array (
             'db' => array(
                 'table' => 'sys_sbs_messages',
                 'key' => 'ID',
                 'submit_name' => 'add_message',
             ),
         ),
         'inputs' => array(
             'subject' => array(
                 'type' => 'text',
                 'name' => 'subject',
                 'value' => $sSubject,
                 'caption' => $sSubjectC,
                 'required' => true,
                 'checker' => array (
                     'func' => 'length',
                     'params' => array(2,128),
                     'error' => $sErrorC,
                 ),
                 'db' => array (
                     'pass' => 'Xss',
                 ),
             ),
             'body' => array(
                 'type' => 'textarea',
                 'name' => 'body',
                 'value' => $sBody,
                 'caption' => $sBodyC,
                 'required' => true,
                 'html' => 1,
                 'checker' => array (
                     'func' => 'length',
                     'params' => array(10,32000),
                     'error' => $sErrorC,
+                ),
                 'db' => array (
+                    'pass' => 'XssHtml',
+                ),
             ),
             'msgs_id' => array(
                 'type' => 'hidden',
                 'name' => 'msgs_id',
                 'value' => $sMessageID,
             ),
             'control' => array (
+    $sErrorC = _t('_Error Occured');
+    $sApplyChangesC = _t('_Submit');
+    $sSubjectC = _t('_Subject');
+    $sBodyC = _t('_adm_mmail_Body');
+    $sTextBodyC = _t('_adm_mmail_Text_email_body');
+    $sPreviewMessageC = _t('_Preview');
+    $sDeleteC = _t('_Delete');
+    $sMessageID = (int)$_POST['msgs_id'];
+    $sSubject = $sBody = "";
+    if($_POST['body'] && $_POST['action'] != 'delete' ) {
+        $sSubject = process_pass_data( $_POST['subject'] );
+        $sBody = process_pass_data( $_POST['body'] );
+    } elseif ( $sMessageID )
+        list($sSubject, $sBody) = $GLOBALS['MySQL']->getRow("SELECT `subject`, `body` FROM `sys_sbs_messages` WHERE `id`='". $sMessageID . "' LIMIT 1", MYSQL_NUM);
+    $sSubject = htmlspecialchars($sSubject);
+    $aForm = array(
+        'form_attrs' => array(
+            'name' => 'sys_sbs_messages',
+            'action' => $GLOBALS['site']['url_admin'] . 'notifies.php',
+            'method' => 'post',
+        ),
+        'params' => array (
+            'db' => array(
+                'table' => 'sys_sbs_messages',
+                'key' => 'ID',
+                'submit_name' => 'add_message',
+            ),
+        ),
+        'inputs' => array(
+            'subject' => array(
+                'type' => 'text',
+                'name' => 'subject',
+                'value' => $sSubject,
+                'caption' => $sSubjectC,
+                'required' => true,
+                'checker' => array (
+                    'func' => 'length',
+                    'params' => array(2,128),
+                    'error' => $sErrorC,
+                ),
+                'db' => array (
+                    'pass' => 'Xss',
+                ),
+            ),
+            'body' => array(
+                'type' => 'textarea',
+                'name' => 'body',
+                'value' => $sBody,
+                'caption' => $sBodyC,
+                'required' => true,
+                'html' => 1,
+                'checker' => array (
+                    'func' => 'length',
+                    'params' => array(10,32000),
+                    'error' => $sErrorC,
+                ),
+                'db' => array (
+                    'pass' => 'XssHtml',
+                ),
+            ),
+            'msgs_id' => array(
+                'type' => 'hidden',
+                'name' => 'msgs_id',
+                'value' => $sMessageID,
+            ),
+            'control' => array (
                 'type' => 'input_set',
                 array(
                     'type' => 'submit',
                     'name' => 'add_message',
                     'caption' => $sApplyChangesC,
                     'value' => $sApplyChangesC,
                 ),
                 array(
                     'type' => 'submit',
                     'name' => 'preview_message',
                     'caption' => $sPreviewMessageC,
                     'value' => $sPreviewMessageC,
                 ),
+            )
         ),
     );
     if($sMessageID) {
         $aForm['inputs']['control'][] = array (
             'type' => 'submit',
             'name' => 'delete_message',
             'caption' => $sDeleteC,
             'value' => $sDeleteC,
         );
+    }
     $sResult = '';
     $oForm = new BxTemplFormView($aForm);
     $oForm->initChecker();
     if ($oForm->isSubmittedAndValid()) {
         if ($sAction == 'add') {
             if ($sMessageID > 0) {
                 $oForm->update($sMessageID);
             } else {
                 $sMessageID = $oForm->insert();
+            }
+        }
         $sResult = $sMessageID > 0 ? MsgBox(_t('_Success'), 3) : MsgBox($sErrorC);
+    }
     return DesignBoxContent(_t('_adm_mmail_Email_message'), '<div style="margin:9px;">' . $sResult . $oForm->getCode() . '</div>', 1);
+                    'type' => 'submit',
+                    'name' => 'add_message',
+                    'caption' => $sApplyChangesC,
+                    'value' => $sApplyChangesC,
+                ),
+                array(
+                    'type' => 'submit',
+                    'name' => 'preview_message',
+                    'caption' => $sPreviewMessageC,
+                    'value' => $sPreviewMessageC,
+                ),
+            )
+        ),
+    );
+    if($sMessageID) {
+        $aForm['inputs']['control'][] = array (
+            'type' => 'submit',
+            'name' => 'delete_message',
+            'caption' => $sDeleteC,
+            'value' => $sDeleteC,
+        );
+    }
+    $sResult = '';
+    $oForm = new BxTemplFormView($aForm);
+    $oForm->initChecker();
+    if ($oForm->isSubmittedAndValid()) {
+        if ($sAction == 'add') {
+            if ($sMessageID > 0) {
+                $oForm->update($sMessageID);
+            } else {
+                $sMessageID = $oForm->insert();
+            }
+        }
+        $sResult = $sMessageID > 0 ? MsgBox(_t('_Success'), 3) : MsgBox($sErrorC);
+    }
+    return DesignBoxContent(_t('_adm_mmail_Email_message'), '<div style="margin:9px;">' . $sResult . $oForm->getCode() . '</div>', 1);
+}
 function getQueueMessage() {
     global $aPreValues;
     if ( $_POST['msgs_id'] ) {
         $aSexValues = getFieldValues('Sex');
         foreach($aSexValues as $sKey => $sValue)
             $aSexValues[$sKey] = _t($sValue);
         $aStartAgesOptions = array();
         $aEndAgesOptions = array();
         $gl_search_start_age = (int)getParam('search_start_age');
         $gl_search_end_age = (int)getParam('search_end_age');
         for ( $i = $gl_search_start_age ; $i <= $gl_search_end_age ; $i++ ) {
             $aStartAgesOptions[$i] = $i;
+        }
         for ( $i = $gl_search_start_age ; $i <= $gl_search_end_age ; $i++ ) {
             $aEndAgesOptions[$i] = $i;
+        }
         $aCountryOptions = array('all' => _t('_All'));
         foreach ( $aPreValues['Country'] as $key => $value ) {
             $aCountryOptions[$key] = _t($value['LKey']);
+        }
         $aMembershipOptions = array('all' => _t('_All'));
         $memberships_arr = getMemberships();
         foreach ( $memberships_arr as $membershipID => $membershipName ) {
             if ($membershipID == MEMBERSHIP_ID_NON_MEMBER) continue;
             $aMembershipOptions[$membershipID] = $membershipName;
+        }
         $iRecipientMembers = (int)$GLOBALS['MySQL']->getOne("SELECT COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Status`<>'Unconfirmed' AND `EmailNotify` = 1 LIMIT 1");
         $aForm = array(
             'form_attrs' => array(
                 'name' => 'form_queue',
                 'class' => 'form_queue_form',
                 'action' => $GLOBALS['site']['url_admin'] . 'notifies.php',
                 'method' => 'post',
             ),
             'inputs' => array (
                 'Send1' => array(
                     'type' => 'checkbox',
                     'name' => 'send_to_subscribers',
                     'label' => _t('_adm_mmail_Send_to_subscribers'),
                     'value' => 'non',
                     'checked' => true
                 ),
                 'Send2' => array(
                     'type' => 'checkbox',
                     'name' => 'send_to_members',
                     'label' => _t('_adm_mmail_Send_to_members'),
                     'value' => 'memb',
                     'checked' => true,
                     'attrs' => array(
                         'onClick' => 'setControlsState();',
                     ),
                     'info' => _t('_adm_mmail_Send_to_members_info', $iRecipientMembers),
                 ),
                 'sex' => array (
                     'type' => 'checkbox_set',
                     'name' => 'sex',
                     'values' => $aSexValues,
                     'value' => array_keys($aSexValues)
                 ),
                 'StartAge' => array (
                     'type' => 'select',
                     'name' => 'age_start',
                     'caption' => _t('_adm_mmail_Age') . ' ' . _t('_from'),
                     'values' => $aStartAgesOptions,
                     'value' => $gl_search_start_age,
                 ),
                 'EndAge' => array (
                     'type' => 'select',
                     'name' => 'age_end',
                     'caption' => _t('_to'),
                     'values' => $aEndAgesOptions,
                     'value' => $gl_search_end_age,
                 ),
                 'Country' => array (
                     'type' => 'select',
                     'name' => 'country',
                     'caption' => _t('_Country'),
                     'values' => $aCountryOptions,
                     'value' => 'all',
                 ),
                 'Membership' => array (
                     'type' => 'select',
                     'name' => 'membership',
                     'caption' => _t('_adm_mmi_membership_levels'),
                     'values' => $aMembershipOptions,
                     'value' => 'all',
                 ),
                 'msgs_id' => array (
                     'type' => 'hidden',
                     'name' => 'msgs_id',
                     'value' => (int)$_POST['msgs_id'],
                 ),
                 'submit' => array (
                     'type' => 'submit',
                     'name' => 'queue_message',
                     'value' => _t('_Submit'),
+                )
+            )
         );
         $oForm = new BxTemplFormView($aForm);
+    global $aPreValues;
+    if ( $_POST['msgs_id'] ) {
+        $aSexValues = getFieldValues('Sex');
+        foreach($aSexValues as $sKey => $sValue)
+            $aSexValues[$sKey] = _t($sValue);
+        $aStartAgesOptions = array();
+        $aEndAgesOptions = array();
+        $gl_search_start_age = (int)getParam('search_start_age');
+        $gl_search_end_age = (int)getParam('search_end_age');
+        for ( $i = $gl_search_start_age ; $i <= $gl_search_end_age ; $i++ ) {
+            $aStartAgesOptions[$i] = $i;
+        }
+        for ( $i = $gl_search_start_age ; $i <= $gl_search_end_age ; $i++ ) {
+            $aEndAgesOptions[$i] = $i;
+        }
+        $aCountryOptions = array('all' => _t('_All'));
+        foreach ( $aPreValues['Country'] as $key => $value ) {
+            $aCountryOptions[$key] = _t($value['LKey']);
+        }
+        $aMembershipOptions = array('all' => _t('_All'));
+        $memberships_arr = getMemberships();
+        foreach ( $memberships_arr as $membershipID => $membershipName ) {
+            if ($membershipID == MEMBERSHIP_ID_NON_MEMBER) continue;
+            $aMembershipOptions[$membershipID] = $membershipName;
+        }
+        $iRecipientMembers = (int)$GLOBALS['MySQL']->getOne("SELECT COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Status`<>'Unconfirmed' AND `EmailNotify` = 1 LIMIT 1");
+        $aForm = array(
+            'form_attrs' => array(
+                'name' => 'form_queue',
+                'class' => 'form_queue_form',
+                'action' => $GLOBALS['site']['url_admin'] . 'notifies.php',
+                'method' => 'post',
+            ),
+            'inputs' => array (
+                'Send1' => array(
+                    'type' => 'checkbox',
+                    'name' => 'send_to_subscribers',
+                    'label' => _t('_adm_mmail_Send_to_subscribers'),
+                    'value' => 'non',
+                    'checked' => true
+                ),
+                'Send2' => array(
+                    'type' => 'checkbox',
+                    'name' => 'send_to_members',
+                    'label' => _t('_adm_mmail_Send_to_members'),
+                    'value' => 'memb',
+                    'checked' => true,
+                    'attrs' => array(
+                        'onClick' => 'setControlsState();',
+                    ),
+                    'info' => _t('_adm_mmail_Send_to_members_info', $iRecipientMembers),
+                ),
+                'sex' => array (
+                    'type' => 'checkbox_set',
+                    'name' => 'sex',
+                    'values' => $aSexValues,
+                    'value' => array_keys($aSexValues)
+                ),
+                'StartAge' => array (
+                    'type' => 'select',
+                    'name' => 'age_start',
+                    'caption' => _t('_adm_mmail_Age') . ' ' . _t('_from'),
+                    'values' => $aStartAgesOptions,
+                    'value' => $gl_search_start_age,
+                ),
+                'EndAge' => array (
+                    'type' => 'select',
+                    'name' => 'age_end',
+                    'caption' => _t('_to'),
+                    'values' => $aEndAgesOptions,
+                    'value' => $gl_search_end_age,
+                ),
+                'Country' => array (
+                    'type' => 'select',
+                    'name' => 'country',
+                    'caption' => _t('_Country'),
+                    'values' => $aCountryOptions,
+                    'value' => 'all',
+                ),
+                'Membership' => array (
+                    'type' => 'select',
+                    'name' => 'membership',
+                    'caption' => _t('_adm_mmi_membership_levels'),
+                    'values' => $aMembershipOptions,
+                    'value' => 'all',
+                ),
+                'msgs_id' => array (
+                    'type' => 'hidden',
+                    'name' => 'msgs_id',
+                    'value' => (int)$_POST['msgs_id'],
+                ),
+                'submit' => array (
+                    'type' => 'submit',
+                    'name' => 'queue_message',
+                    'value' => _t('_Submit'),
+                )
+            )
+        );
+        $oForm = new BxTemplFormView($aForm);
         $sTmplResult = $GLOBALS['oAdmTemplate']->parseHtmlByName('notifies_filter.html', array());
         return DesignBoxContent(_t('_adm_mmail_Queue_message'), '<div style="margin:9px;">' . $oForm->getCode() . $sTmplResult . '</div>', 1);
+    }
+        return DesignBoxContent(_t('_adm_mmail_Queue_message'), '<div style="margin:9px;">' . $oForm->getCode() . $sTmplResult . '</div>', 1);
+    }
+}
 function QueueMessage() {
     global $MySQL;
     $iEmails = 0;
     $sReturn = "";
     $iMsgId = (int)$_POST['msgs_id'];
     $aOriginalMessage = $MySQL->getRow("SELECT `id`, `subject`, `body` FROM `sys_sbs_messages` WHERE `id`='" . $iMsgId . "' LIMIT 1");
     if(!is_array($aOriginalMessage) || empty($aOriginalMessage)) {
         return _t('_adm_mmail_Failed_to_queue_emails_X', $iMsgId);
+    }
     //--- Send to all subscribers
+    $oEmailTemplates = new BxDolEmailTemplates();
     if($_POST['send_to_subscribers'] == 'non') {
         $sSql = "SELECT
+    $iEmails = 0;
+    $sReturn = "";
+    $iMsgId = (int)$_POST['msgs_id'];
+    $aOriginalMessage = $MySQL->getRow("SELECT `id`, `subject`, `body` FROM `sys_sbs_messages` WHERE `id`='" . $iMsgId . "' LIMIT 1");
+    if(!is_array($aOriginalMessage) || empty($aOriginalMessage)) {
+        return _t('_adm_mmail_Failed_to_queue_emails_X', $iMsgId);
+    }
+    //--- Send to all subscribers
+    $oEmailTemplates = new BxDolEmailTemplates();
+    if($_POST['send_to_subscribers'] == 'non') {
+        $sSql = "SELECT
                     `tsu`.`name` AS `user_name`,
                     `tsu`.`email` AS `user_email`,
 …
                 INNER JOIN `sys_sbs_users` AS `tsu` ON `tse`.`subscriber_id`=`tsu`.`id`
                 WHERE
                     `tst`.`unit`='system' AND
+                    `tst`.`unit`='system' AND
                     `tst`.`action`='mass_mailer'";
         $aSubscribers = $MySQL->getAll($sSql);
         foreach($aSubscribers as $aSubscriber) {
             if(empty($aSubscriber['user_email']))
                 continue;
             $aMessage = $oEmailTemplates->parseTemplate($aSubscriber['template_name'], array(
+        foreach($aSubscribers as $aSubscriber) {
+            if(empty($aSubscriber['user_email']))
+                continue;
+            $aMessage = $oEmailTemplates->parseTemplate($aSubscriber['template_name'], array(
                 'RealName' => $aSubscriber['user_name'],
                 'Email' => $aSubscriber['user_email'],
                 'MessageSubject' => $aOriginalMessage['subject'],
                 'MessageText' => $aOriginalMessage['body']
             ));
             $mixedResult = $MySQL->query("INSERT INTO `sys_sbs_queue`(`email`, `subject`, `body`) VALUES('" . $aSubscriber['user_email'] . "', '" . process_db_input($aMessage['subject'], BX_TAGS_STRIP) . "', '" . process_db_input($aMessage['body'], BX_TAGS_VALIDATE) . "')");
             if($mixedResult === false) {
                 $sReturn .= _t('_adm_mmail_Email_not_added_to_queue_X', $aSubscriber['user_email']);
                 continue;
+            }
             $iEmails++;
+        }
+    }
     //--- Send to all profiles
     if($_POST['send_to_members'] == 'memb') {
         //--- Sex filter
         $sex_filter_sql = '';
         if(is_array($_POST['sex']) && !empty($_POST['sex']))
             $sex_filter_sql = "AND `Sex` IN ('" . implode("','", $_POST['sex']) . "')";
         //--- Age filter
         $age_filter_sql = '';
         $age_start = (int)$_POST['age_start'];
         $age_end = (int)$_POST['age_end'];
         if ( $age_start && $age_end ) {
             $date_start = (int)( date( "Y" ) - $age_start );
             $date_end = (int)( date( "Y" ) - $age_end - 1 );
             $date_start = $date_start . date( "-m-d" );
             $date_end = $date_end . date( "-m-d" );
             $age_filter_sql = "AND (TO_DAYS(`DateOfBirth`) BETWEEN TO_DAYS('{$date_end}') AND (TO_DAYS('{$date_start}')+1))";
+        }
         //--- Country filter
         $country_filter_sql = '';
         if($_POST['country'] != 'all') {
             $country = process_db_input($_POST['country']);
             $country_filter_sql = "AND `Country` = '{$country}'";
+        }
         //--- Membership filter
         $membershipID = $_POST['membership'] != 'all' ? (int)$_POST['membership'] : -1;
         $aMembers = $MySQL->getAll("SELECT `ID` AS `id`, `Email` AS `email` FROM `Profiles` WHERE `Status` <> 'Unconfirmed' AND `EmailNotify` = 1 AND (`Couple` = '0' OR `Couple` > `ID`) {$sex_filter_sql} {$age_filter_sql} {$country_filter_sql}");
         foreach($aMembers as $aMember) {
             if(empty($aMember['email']))
                 continue;
             //--- Dynamic membership filter
             $membership_info = getMemberMembershipInfo($aMember['id']);
             if ($membershipID != -1 && $membership_info['ID'] != $membershipID )
                 continue;
+            ));
+            $mixedResult = $MySQL->query("INSERT INTO `sys_sbs_queue`(`email`, `subject`, `body`) VALUES('" . $aSubscriber['user_email'] . "', '" . process_db_input($aMessage['subject'], BX_TAGS_STRIP) . "', '" . process_db_input($aMessage['body'], BX_TAGS_VALIDATE) . "')");
+            if($mixedResult === false) {
+                $sReturn .= _t('_adm_mmail_Email_not_added_to_queue_X', $aSubscriber['user_email']);
+                continue;
+            }
+            $iEmails++;
+        }
+    }
+    //--- Send to all profiles
+    if($_POST['send_to_members'] == 'memb') {
+        //--- Sex filter
+        $sex_filter_sql = '';
+        if(is_array($_POST['sex']) && !empty($_POST['sex']))
+            $sex_filter_sql = "AND `Sex` IN ('" . implode("','", $_POST['sex']) . "')";
+        //--- Age filter
+        $age_filter_sql = '';
+        $age_start = (int)$_POST['age_start'];
+        $age_end = (int)$_POST['age_end'];
+        if ( $age_start && $age_end ) {
+            $date_start = (int)( date( "Y" ) - $age_start );
+            $date_end = (int)( date( "Y" ) - $age_end - 1 );
+            $date_start = $date_start . date( "-m-d" );
+            $date_end = $date_end . date( "-m-d" );
+            $age_filter_sql = "AND (TO_DAYS(`DateOfBirth`) BETWEEN TO_DAYS('{$date_end}') AND (TO_DAYS('{$date_start}')+1))";
+        }
+        //--- Country filter
+        $country_filter_sql = '';
+        if($_POST['country'] != 'all') {
+            $country = process_db_input($_POST['country']);
+            $country_filter_sql = "AND `Country` = '{$country}'";
+        }
+        //--- Membership filter
+        $membershipID = $_POST['membership'] != 'all' ? (int)$_POST['membership'] : -1;
+        $aMembers = $MySQL->getAll("SELECT `ID` AS `id`, `Email` AS `email` FROM `Profiles` WHERE `Status` <> 'Unconfirmed' AND `EmailNotify` = 1 AND (`Couple` = '0' OR `Couple` > `ID`) {$sex_filter_sql} {$age_filter_sql} {$country_filter_sql}");
+        foreach($aMembers as $aMember) {
+            if(empty($aMember['email']))
+                continue;
+            //--- Dynamic membership filter
+            $membership_info = getMemberMembershipInfo($aMember['id']);
+            if ($membershipID != -1 && $membership_info['ID'] != $membershipID )
+                continue;
             $aMessage = $oEmailTemplates->parseTemplate('t_AdminEmail', array(
                 'MessageSubject' => $aOriginalMessage['subject'],
                 'MessageText' => $aOriginalMessage['body']
             ), $aMember['id']);
             $mixedResult = $MySQL->query("INSERT INTO `sys_sbs_queue`(`email`, `subject`, `body`) VALUES('" . $aMember['email'] . "', '" . process_db_input($aMessage['subject'], BX_TAGS_STRIP) . "', '" . process_db_input($aMessage['body'], BX_TAGS_VALIDATE) . "')");
             if($mixedResult === false) {
                 $sReturn .= _t('_adm_mmail_Email_not_added_to_queue_X', $aMember['email']);
                 continue;
+            }
             $iEmails++;
+        }
+    }
     $sReturn .= _t('_adm_mmail_X_emails_was_succ_added_to_queue', (int)$iEmails);
     return $sReturn;
+            ), $aMember['id']);
+            $mixedResult = $MySQL->query("INSERT INTO `sys_sbs_queue`(`email`, `subject`, `body`) VALUES('" . $aMember['email'] . "', '" . process_db_input($aMessage['subject'], BX_TAGS_STRIP) . "', '" . process_db_input($aMessage['body'], BX_TAGS_VALIDATE) . "')");
+            if($mixedResult === false) {
+                $sReturn .= _t('_adm_mmail_Email_not_added_to_queue_X', $aMember['email']);
+                continue;
+            }
+            $iEmails++;
+        }
+    }
+    $sReturn .= _t('_adm_mmail_X_emails_was_succ_added_to_queue', (int)$iEmails);
+    return $sReturn;
+}
 …
     $sPreview = '<div style="margin:9px;">' . $aMessage['body'] . '</div>';
     return DesignBoxContent(_t('_Preview'), $sPreview, 1);
+    return DesignBoxContent(_t('_Preview'), $sPreview, 1);
+}
 function DeleteMessage() {
     $mixedResult = $GLOBALS['MySQL']->query("DELETE FROM `sys_sbs_messages` WHERE `id`='". (int)$_POST['msgs_id'] . "' LIMIT 1");
     if($mixedResult === false)
         return $mixedResult;
     $_POST['msgs_id'] = 0;
     return true;
+    $mixedResult = $GLOBALS['MySQL']->query("DELETE FROM `sys_sbs_messages` WHERE `id`='". (int)$_POST['msgs_id'] . "' LIMIT 1");
+    if($mixedResult === false)
+        return $mixedResult;
+    $_POST['msgs_id'] = 0;
+    return true;
+}
 function EmptyQueue() {
     return db_res("TRUNCATE TABLE `sys_sbs_queue`");
+    return db_res("TRUNCATE TABLE `sys_sbs_queue`");
+}

trunk/administration/notify_preview.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/

trunk/administration/pageBuilder.php

r15201	r15211
41	41
42	42	$GLOBALS['oAdmTemplate']->addJsTranslation(array(
43		'_adm_btn_Column', '_Are you sure?',
	43	'_adm_btn_Column', '_Are you sure?',
44	44	));
45	45

trunk/administration/phpinfo.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/

trunk/administration/preValues.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $aFields = array(
     'Value'  => 'The value stored in the database',
     'LKey'   => 'Primary language key used for displaying',
     'LKey2'  => 'Secondary language key used for displaying in some other places',
     'LKey3'  => 'Miscelaniuos language key used for displaying in some other places.',
     'Extra'  => 'Extra parameter. Used for example as link to profile image for Sex list.',
     'Extra2' => 'Miscelanious extra parameter',
     'Extra3' => 'Miscelanious extra parameter'
+    'Value'  => 'The value stored in the database',
+    'LKey'   => 'Primary language key used for displaying',
+    'LKey2'  => 'Secondary language key used for displaying in some other places',
+    'LKey3'  => 'Miscelaniuos language key used for displaying in some other places.',
+    'Extra'  => 'Extra parameter. Used for example as link to profile image for Sex list.',
+    'Extra2' => 'Miscelanious extra parameter',
+    'Extra3' => 'Miscelanious extra parameter'
 );
 if(bx_get('popup') !== false && (int)bx_get('popup') == 1) {
     $iAmInPopup = true;
     $iNameIndex = 17;
+    $iAmInPopup = true;
+    $iNameIndex = 17;
     $_page = array(
         'name_index' => $iNameIndex,
         'css_name' => array('predefined_values.css'),
         'js_name' => array(),
         'header' => _t('_adm_page_cpt_pvalues_manage'),
         'header_text' => _t('_adm_box_cpt_pvalues_manage'),
+        'header' => _t('_adm_page_cpt_pvalues_manage'),
+        'header_text' => _t('_adm_box_cpt_pvalues_manage'),
     );
     $_page_cont[$iNameIndex]['page_main_code'] = PageCompPageMainCode();
 } else {
     $iAmInPopup = false;
     $iNameIndex = 0;
+    $iAmInPopup = false;
+    $iNameIndex = 0;
     $_page = array(
         'name_index' => $iNameIndex,
         'css_name' => array('predefined_values.css'),
         'js_name' => array(),
         'header' => _t('_adm_page_cpt_pvalues_manage'),
         'header_text' => _t('_adm_box_cpt_pvalues_manage'),
+        'header' => _t('_adm_page_cpt_pvalues_manage'),
+        'header_text' => _t('_adm_box_cpt_pvalues_manage'),
     );
     $_page_cont[$iNameIndex]['page_main_code'] = PageCompPageMainCode();
+    $_page_cont[$iNameIndex]['page_main_code'] = PageCompPageMainCode();
+}
 …
 function PageCompPageMainCode() {
     global $iAmInPopup;
     global $aFields;
     $sDeleteIcon = $GLOBALS['oAdmTemplate']->getImageUrl('minus1.gif');
     $sUpIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_up.gif');
     $sDownIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_down.gif');
+    global $iAmInPopup;
+    global $aFields;
+    $sDeleteIcon = $GLOBALS['oAdmTemplate']->getImageUrl('minus1.gif');
+    $sUpIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_up.gif');
+    $sDownIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_down.gif');
     $sPopupAdd = $iAmInPopup ? '&popup=1' : '';
     $sResultMsg = '';
     if( isset( $_POST['action'] ) and $_POST['action'] == 'Save' and isset( $_POST['PreList'] ) and is_array( $_POST['PreList'] ) ) {
+    if( isset( $_POST['action'] ) and $_POST['action'] == 'Save' and isset( $_POST['PreList'] ) and is_array( $_POST['PreList'] ) ) {
         if (true === saveList( $_POST['list'], $_POST['PreList'] ))
             $sResultMsg = _t('_Success');
         else
             $sResultMsg = _t('_Failed to apply changes');
+    }
     //get lists
     $aLists = array( '' => '- Select -' );
     $aKeys = getPreKeys();
     foreach ($aKeys as $aList)
         $aLists[ $aList['Key'] ] = $aList['Key'];
     $sListIn = bx_get('list');
     if ($sListIn !== false) {
         $sList_db = process_db_input($sListIn);
         $sList    = process_pass_data($sListIn);
+        $iCount = getPreValuesCount($sListIn);
         if (!$iCount) //if no rows returned...
             $aLists[ $sList ] = $sList; //create new list
     } else {
         $sList = '';
+    }
+    }
+    //get lists
+    $aLists = array( '' => '- Select -' );
+    $aKeys = getPreKeys();
+    foreach ($aKeys as $aList)
+        $aLists[ $aList['Key'] ] = $aList['Key'];
+    $sListIn = bx_get('list');
+    if ($sListIn !== false) {
+        $sList_db = process_db_input($sListIn);
+        $sList    = process_pass_data($sListIn);
+        $iCount = getPreValuesCount($sListIn);
+        if (!$iCount) //if no rows returned...
+            $aLists[ $sList ] = $sList; //create new list
+    } else {
+        $sList = '';
+    }
     ob_start();
 …
     if ($sResultMsg)
         echo MsgBox($sResultMsg);
+    ?>
     <script type="text/javascript">
         function createNewList() {
             var sNewList = prompt( 'Please enter name of new list' );
             if( sNewList == null )
                 return false;
             sNewList = $.trim( sNewList );
             if( !sNewList.length ) {
                 alert( 'You should enter correct name' );
                 return false;
+            }
             window.location = '<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>?list=' + encodeURIComponent( sNewList ) + '<?= $sPopupAdd ?>';
+        }
         function addRow( eImg ) {
             $( eImg ).parent().parent().before(
                 '<tr>' +
                 <?
                 foreach( $aFields as $sField => $sHelp ) {
                     ?>
                     '<td><input type="text" class="value_input" name="PreList[' + iNextInd + '][<?= $sField ?>]" value="" /></td>' +
                     <?
+                }
                 ?>
                     '<th>' +
                         '<img src="<?= $sDeleteIcon ?>"     class="row_control" title="Delete"    alt="Delete" onclick="delRow( this );" />' +
                         '<img src="<?= $sUpIcon ?>"   class="row_control" title="Move up"   alt="Move up" onclick="moveUpRow( this );" />' +
                         '<img src="<?= $sDownIcon ?>" class="row_control" title="Move down" alt="Move down" onclick="moveDownRow( this );" />' +
                     '</th>' +
                 '</tr>'
             );
             iNextInd ++;
             sortZebra();
+        }
         function delRow( eImg ) {
             $( eImg ).parent().parent().remove();
             sortZebra();
+        }
         function moveUpRow( eImg ) {
             var oCur = $( eImg ).parent().parent();
             var oPrev = oCur.prev( ':not(.headers)' );
             if( !oPrev.length )
                 return;
             // swap elements values
             var oCurElems  = $('input', oCur.get(0));
             var oPrevElems = $('input', oPrev.get(0));
             oCurElems.each( function(iInd) {
                 var oCurElem  = $( this );
                 var oPrevElem = oPrevElems.filter( ':eq(' + iInd + ')' );
                 // swap them
                 var sCurValue = oCurElem.val();
                 oCurElem.val( oPrevElem.val() );
                 oPrevElem.val( sCurValue );
             } );
+        }
         function moveDownRow( eImg ) {
             var oCur = $( eImg ).parent().parent();
             var oPrev = oCur.next( ':not(.headers)' );
             if( !oPrev.length )
                 return;
             // swap elements values
             var oCurElems  = $('input', oCur.get(0));
             var oPrevElems = $('input', oPrev.get(0));
             oCurElems.each( function(iInd) {
                 var oCurElem  = $( this );
                 var oPrevElem = oPrevElems.filter( ':eq(' + iInd + ')' );
                 // swap them
                 var sCurValue = oCurElem.val();
                 oCurElem.val( oPrevElem.val() );
                 oPrevElem.val( sCurValue );
             } );
+        }
         function sortZebra() {
             $( '#listEdit tr:even' ).removeClass( 'even odd' ).addClass( 'even' );
             $( '#listEdit tr:odd'  ).removeClass( 'even odd' ).addClass( 'odd'  );
+        }
         //just a design
         $( document ).ready( sortZebra );
     </script>
     <form action="<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>" method="post">
         <table id="listEdit" cellpadding="0" cellspacing="0">
             <tr>
                 <th colspan="<?= count( $aFields ) + 1 ?>">
                     Select a list:
                     <select name="list"
                       onchange="if( this.value != '' ) window.location = '<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>' + '?list=' + encodeURIComponent( this.value ) + '<?= $sPopupAdd ?>';">
                         <?= genListOptions( $aLists, $sList ) ?>
                     </select>
                     <input type="button" value="Create New" onclick="createNewList();" />
                 </th>
             </tr>
     <?
     if( $sList !== '' ) {
         $iNextInd = genListRows( $sList_db );
         ?>
             <tr>
                 <th colspan="8">
                     <input type="hidden" name="popup" value="<?= $iAmInPopup ?>" />
                     <input type="submit" name="action" value="Save" />
                 </th>
             </tr>
         <?
     } else
         $iNextInd = 0;
     ?>
         </table>
         <script type="text/javascript">
             iNextInd = <?= $iNextInd ?>;
         </script>
     </form>
     <?
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => ob_get_clean()));
+    ?>
+    <script type="text/javascript">
+        function createNewList() {
+            var sNewList = prompt( 'Please enter name of new list' );
+            if( sNewList == null )
+                return false;
+            sNewList = $.trim( sNewList );
+            if( !sNewList.length ) {
+                alert( 'You should enter correct name' );
+                return false;
+            }
+            window.location = '<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>?list=' + encodeURIComponent( sNewList ) + '<?= $sPopupAdd ?>';
+        }
+        function addRow( eImg ) {
+            $( eImg ).parent().parent().before(
+                '<tr>' +
+                <?
+                foreach( $aFields as $sField => $sHelp ) {
+                    ?>
+                    '<td><input type="text" class="value_input" name="PreList[' + iNextInd + '][<?= $sField ?>]" value="" /></td>' +
+                    <?
+                }
+                ?>
+                    '<th>' +
+                        '<img src="<?= $sDeleteIcon ?>"     class="row_control" title="Delete"    alt="Delete" onclick="delRow( this );" />' +
+                        '<img src="<?= $sUpIcon ?>"   class="row_control" title="Move up"   alt="Move up" onclick="moveUpRow( this );" />' +
+                        '<img src="<?= $sDownIcon ?>" class="row_control" title="Move down" alt="Move down" onclick="moveDownRow( this );" />' +
+                    '</th>' +
+                '</tr>'
+            );
+            iNextInd ++;
+            sortZebra();
+        }
+        function delRow( eImg ) {
+            $( eImg ).parent().parent().remove();
+            sortZebra();
+        }
+        function moveUpRow( eImg ) {
+            var oCur = $( eImg ).parent().parent();
+            var oPrev = oCur.prev( ':not(.headers)' );
+            if( !oPrev.length )
+                return;
+            // swap elements values
+            var oCurElems  = $('input', oCur.get(0));
+            var oPrevElems = $('input', oPrev.get(0));
+            oCurElems.each( function(iInd) {
+                var oCurElem  = $( this );
+                var oPrevElem = oPrevElems.filter( ':eq(' + iInd + ')' );
+                // swap them
+                var sCurValue = oCurElem.val();
+                oCurElem.val( oPrevElem.val() );
+                oPrevElem.val( sCurValue );
+            } );
+        }
+        function moveDownRow( eImg ) {
+            var oCur = $( eImg ).parent().parent();
+            var oPrev = oCur.next( ':not(.headers)' );
+            if( !oPrev.length )
+                return;
+            // swap elements values
+            var oCurElems  = $('input', oCur.get(0));
+            var oPrevElems = $('input', oPrev.get(0));
+            oCurElems.each( function(iInd) {
+                var oCurElem  = $( this );
+                var oPrevElem = oPrevElems.filter( ':eq(' + iInd + ')' );
+                // swap them
+                var sCurValue = oCurElem.val();
+                oCurElem.val( oPrevElem.val() );
+                oPrevElem.val( sCurValue );
+            } );
+        }
+        function sortZebra() {
+            $( '#listEdit tr:even' ).removeClass( 'even odd' ).addClass( 'even' );
+            $( '#listEdit tr:odd'  ).removeClass( 'even odd' ).addClass( 'odd'  );
+        }
+        //just a design
+        $( document ).ready( sortZebra );
+    </script>
+    <form action="<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>" method="post">
+        <table id="listEdit" cellpadding="0" cellspacing="0">
+            <tr>
+                <th colspan="<?= count( $aFields ) + 1 ?>">
+                    Select a list:
+                    <select name="list"
+                      onchange="if( this.value != '' ) window.location = '<?=$GLOBALS['site']['url_admin'] . 'preValues.php'; ?>' + '?list=' + encodeURIComponent( this.value ) + '<?= $sPopupAdd ?>';">
+                        <?= genListOptions( $aLists, $sList ) ?>
+                    </select>
+                    <input type="button" value="Create New" onclick="createNewList();" />
+                </th>
+            </tr>
+    <?
+    if( $sList !== '' ) {
+        $iNextInd = genListRows( $sList_db );
+        ?>
+            <tr>
+                <th colspan="8">
+                    <input type="hidden" name="popup" value="<?= $iAmInPopup ?>" />
+                    <input type="submit" name="action" value="Save" />
+                </th>
+            </tr>
+        <?
+    } else
+        $iNextInd = 0;
+    ?>
+        </table>
+        <script type="text/javascript">
+            iNextInd = <?= $iNextInd ?>;
+        </script>
+    </form>
+    <?
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('design_box_content.html', array('content' => ob_get_clean()));
+}
 function genListOptions( $aLists, $sActive ) {
     $sRet = '';
     foreach( $aLists as $sKey => $sValue ) {
         $sRet .= '
             <option value="' .
             htmlspecialchars( $sKey ) .
             '"' . ( ( $sKey == $sActive ) ? ' selected="selected"' : '' ) .
             '>' . htmlspecialchars( $sValue ) . '</option>';
+    }
     return $sRet;
+    $sRet = '';
+    foreach( $aLists as $sKey => $sValue ) {
+        $sRet .= '
+            <option value="' .
+            htmlspecialchars( $sKey ) .
+            '"' . ( ( $sKey == $sActive ) ? ' selected="selected"' : '' ) .
+            '>' . htmlspecialchars( $sValue ) . '</option>';
+    }
+    return $sRet;
+}
 function genListRows( $sList ) {
     global $aFields;
     $sDeleteIcon = $GLOBALS['oAdmTemplate']->getImageUrl('minus1.gif');
     $sUpIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_up.gif');
     $sDownIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_down.gif');
     $aRows = getPreValues($sList);
     ?>
         <tr class="headers">
     <?
     foreach( $aFields as $sField => $sHelp ) {
         ?>
             <th>
                 <span class="tableLabel"
                   onmouseover="showFloatDesc( '<?= addslashes( htmlspecialchars( $sHelp ) ) ?>' );"
                   onmousemove="moveFloatDesc( event );"
                   onmouseout="hideFloatDesc();">
                     <?= $sField ?>
                 </span>
             </th>
         <?
+    }
     ?>
             <th>&nbsp;</th>
         </tr>
     <?
     $iCounter = 0;
     foreach ($aRows as $aRow) {
         ?>
         <tr>
         <?
         foreach( $aFields as $sField => $sHelp ) {
             ?>
             <td><input type="text" class="value_input" name="PreList[<?= $iCounter ?>][<?= $sField ?>]" value="<?= htmlspecialchars( $aRow[$sField] ) ?>" /></td>
             <?
+        }
         ?>
             <th><img src="<?=$sDeleteIcon?>"     class="row_control" title="Delete"    alt="Delete" onclick="delRow( this );" /><img src="<?= $sUpIcon ?>"   class="row_control" title="Move up"   alt="Move up" onclick="moveUpRow( this );" /><img src="<?= $sDownIcon ?>" class="row_control" title="Move down" alt="Move down" onclick="moveDownRow( this );" /></th>
         </tr>
         <?
         $iCounter ++;
+    }
     ?>
         <tr class="headers">
             <td colspan="<?= count( $aFields ) ?>">&nbsp;</td>
             <th>
+    global $aFields;
+    $sDeleteIcon = $GLOBALS['oAdmTemplate']->getImageUrl('minus1.gif');
+    $sUpIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_up.gif');
+    $sDownIcon = $GLOBALS['oAdmTemplate']->getImageUrl('arrow_down.gif');
+    $aRows = getPreValues($sList);
+    ?>
+        <tr class="headers">
+    <?
+    foreach( $aFields as $sField => $sHelp ) {
+        ?>
+            <th>
+                <span class="tableLabel"
+                  onmouseover="showFloatDesc( '<?= addslashes( htmlspecialchars( $sHelp ) ) ?>' );"
+                  onmousemove="moveFloatDesc( event );"
+                  onmouseout="hideFloatDesc();">
+                    <?= $sField ?>
+                </span>
+            </th>
+        <?
+    }
+    ?>
+            <th>&nbsp;</th>
+        </tr>
+    <?
+    $iCounter = 0;
+    foreach ($aRows as $aRow) {
+        ?>
+        <tr>
+        <?
+        foreach( $aFields as $sField => $sHelp ) {
+            ?>
+            <td><input type="text" class="value_input" name="PreList[<?= $iCounter ?>][<?= $sField ?>]" value="<?= htmlspecialchars( $aRow[$sField] ) ?>" /></td>
+            <?
+        }
+        ?>
+            <th><img src="<?=$sDeleteIcon?>"     class="row_control" title="Delete"    alt="Delete" onclick="delRow( this );" /><img src="<?= $sUpIcon ?>"   class="row_control" title="Move up"   alt="Move up" onclick="moveUpRow( this );" /><img src="<?= $sDownIcon ?>" class="row_control" title="Move down" alt="Move down" onclick="moveDownRow( this );" /></th>
+        </tr>
+        <?
+        $iCounter ++;
+    }
+    ?>
+        <tr class="headers">
+            <td colspan="<?= count( $aFields ) ?>">&nbsp;</td>
+            <th>
                 <img src="<?= $GLOBALS['oAdmTemplate']->getImageUrl('plus1.gif') ?>" class="row_control" title="Add" alt="Add" onclick="addRow( this );" />
             </th>
         </tr>
     <?
     return $iCounter;
+            </th>
+        </tr>
+    <?
+    return $iCounter;
+}
 function saveList( $sList, $aData ) {
     global $aFields;
     global $iAmInPopup;
     $sList_db = trim( process_db_input( $sList ) );
     if( $sList_db == '' )
         return false;
     $sQuery = "DELETE FROM `" . BX_SYS_PRE_VALUES_TABLE . "` WHERE `Key` = '$sList_db'";
     db_res( $sQuery );
     $sValuesAlter = '';
     foreach( $aData as $iInd => $aRow ) {
         $aRow['Value'] = str_replace( ',', '', trim( $aRow['Value'] ) );
         if( $aRow['Value'] == '' )
             continue;
         $sValuesAlter .= "'" . process_db_input( $aRow['Value'] ) . "', ";
         $sInsFields = '';
         $sInsValues = '';
         foreach( $aFields as $sField => $sTemp ) {
             $sValue = trim( process_db_input( $aRow[$sField] ) );
             $sInsFields .= "`$sField`, ";
             $sInsValues .= "'$sValue', ";
+        }
         $sInsFields = substr( $sInsFields, 0, -2 ); //remove ', '
         $sInsValues = substr( $sInsValues, 0, -2 );
         $sQuery = "INSERT INTO `" . BX_SYS_PRE_VALUES_TABLE . "` ( `Key`, $sInsFields, `Order` ) VALUES ( '$sList_db', $sInsValues, $iInd )";
         db_res( $sQuery );
+    }
     //alter Profiles table
     $sValuesAlter = substr( $sValuesAlter, 0, -2 ); //remove ', '
     $sQuery = "SELECT `Name` FROM `sys_profile_fields` WHERE `Type` = 'select_set' AND `Values` = '#!{$sList_db}'";
     $rFields = db_res( $sQuery );
     while( $aField = mysql_fetch_assoc( $rFields ) ) {
         $sField = $aField['Name'];
         $sQuery = "ALTER TABLE `Profiles` CHANGE `$sField` `$sField` set($sValuesAlter) NOT NULL default ''";
         db_res( $sQuery );
+    }
     compilePreValues();
+    global $aFields;
+    global $iAmInPopup;
+    $sList_db = trim( process_db_input( $sList ) );
+    if( $sList_db == '' )
+        return false;
+    $sQuery = "DELETE FROM `" . BX_SYS_PRE_VALUES_TABLE . "` WHERE `Key` = '$sList_db'";
+    db_res( $sQuery );
+    $sValuesAlter = '';
+    foreach( $aData as $iInd => $aRow ) {
+        $aRow['Value'] = str_replace( ',', '', trim( $aRow['Value'] ) );
+        if( $aRow['Value'] == '' )
+            continue;
+        $sValuesAlter .= "'" . process_db_input( $aRow['Value'] ) . "', ";
+        $sInsFields = '';
+        $sInsValues = '';
+        foreach( $aFields as $sField => $sTemp ) {
+            $sValue = trim( process_db_input( $aRow[$sField] ) );
+            $sInsFields .= "`$sField`, ";
+            $sInsValues .= "'$sValue', ";
+        }
+        $sInsFields = substr( $sInsFields, 0, -2 ); //remove ', '
+        $sInsValues = substr( $sInsValues, 0, -2 );
+        $sQuery = "INSERT INTO `" . BX_SYS_PRE_VALUES_TABLE . "` ( `Key`, $sInsFields, `Order` ) VALUES ( '$sList_db', $sInsValues, $iInd )";
+        db_res( $sQuery );
+    }
+    //alter Profiles table
+    $sValuesAlter = substr( $sValuesAlter, 0, -2 ); //remove ', '
+    $sQuery = "SELECT `Name` FROM `sys_profile_fields` WHERE `Type` = 'select_set' AND `Values` = '#!{$sList_db}'";
+    $rFields = db_res( $sQuery );
+    while( $aField = mysql_fetch_assoc( $rFields ) ) {
+        $sField = $aField['Name'];
+        $sQuery = "ALTER TABLE `Profiles` CHANGE `$sField` `$sField` set($sValuesAlter) NOT NULL default ''";
+        db_res( $sQuery );
+    }
+    compilePreValues();
     if( $iAmInPopup )

trunk/administration/profiles.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
     $oEmailTemplate = new BxDolEmailTemplates();
     foreach($_POST['members'] as $iId) {
         createUserDataFile((int)$iId);
         reparseObjTags('profile', (int)$iId);
         $aProfile = getProfileInfo($iId);
         $aMail = $oEmailTemplate->parseTemplate('t_Activation', array(), $iId);
         sendMail($aProfile['Email'], $aMail['subject'], $aMail['body']);
+        createUserDataFile((int)$iId);
+        reparseObjTags('profile', (int)$iId);
+        $aProfile = getProfileInfo($iId);
+        $aMail = $oEmailTemplate->parseTemplate('t_Activation', array(), $iId);
+        sendMail($aProfile['Email'], $aMail['subject'], $aMail['body']);
         $oAlert = new BxDolAlerts('profile', 'change_status', (int)$iId, 0, array('status' => 'Active'));
 …
     echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
     exit;
+}
+}
 else if(isset($_POST['adm-mp-deactivate']) && (bool)$_POST['members']) {
     $GLOBALS['MySQL']->query("UPDATE `Profiles` SET `Status`='Approval' WHERE `ID` IN ('" . implode("','", $_POST['members']) . "')");
     foreach($_POST['members'] as $iId) {
         createUserDataFile((int)$iId);
         reparseObjTags('profile', (int)$iId);
+        createUserDataFile((int)$iId);
+        reparseObjTags('profile', (int)$iId);
         $oAlert = new BxDolAlerts('profile', 'change_status', (int)$iId, 0, array('status' => 'Approval'));
         $oAlert->alert();
 …
     echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
     exit;
+}
+}
 else if(isset($_POST['adm-mp-ban']) && (bool)$_POST['members']) {
     foreach($_POST['members'] as $iId)
         $GLOBALS['MySQL']->query("REPLACE INTO `sys_admin_ban_list` SET `ProfID`='" . $iId . "', `Time`='0',  `DateTime`=NOW()");
     echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
     exit;
+}
 else if(isset($_POST['adm-mp-unban']) && (bool)$_POST['members']) {
+    echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
+    exit;
+}
+else if(isset($_POST['adm-mp-unban']) && (bool)$_POST['members']) {
     $GLOBALS['MySQL']->query("DELETE FROM `sys_admin_ban_list` WHERE `ProfID` IN ('" . implode("','", $_POST['members']) . "')");
     echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
     exit;
+}
 else if(isset($_POST['adm-mp-delete']) && (bool)$_POST['members']) {
+}
+else if(isset($_POST['adm-mp-delete']) && (bool)$_POST['members']) {
     foreach($_POST['members'] as $iId)
         $bResult = profile_delete((int)$iId);
     echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
     exit;
+}
 else if(isset($_POST['adm-mp-confirm']) && (bool)$_POST['members']) {
+    echo "<script>window.parent." . BX_DOL_ADM_MP_JS_NAME . ".reload();</script>";
+    exit;
+}
+else if(isset($_POST['adm-mp-confirm']) && (bool)$_POST['members']) {
     foreach($_POST['members'] as $iId)
         activation_mail((int)$iId, 0);
     echo "<script>alert('" . _t('_adm_txt_mp_activation_sent') . "')</script>";
+    echo "<script>alert('" . _t('_adm_txt_mp_activation_sent') . "')</script>";
     exit;
+}
 …
+        }
     $oJson = new Services_JSON();
+    $oJson = new Services_JSON();
     echo $oJson->encode(array('code' => 0, 'content' => getMembers(array(
         'view_type' => $_POST['view_type'],
+        'view_type' => $_POST['view_type'],
         'view_start' => (int)$_POST['view_start'],
         'view_per_page' => (int)$_POST['view_per_page'],
 …
+}
 else if(isset($_POST['action']) && $_POST['action'] == 'get_controls') {
     $oJson = new Services_JSON();
     $sCtlType = process_db_input($_POST['ctl_type'], BX_TAGS_STRIP);
     $sMethodName = 'getBlock' . ucfirst($sCtlType);
     if(!function_exists($sMethodName)) {
         echo '{}';
         exit;
+    }
+    $oJson = new Services_JSON();
+    $sCtlType = process_db_input($_POST['ctl_type'], BX_TAGS_STRIP);
+    $sMethodName = 'getBlock' . ucfirst($sCtlType);
+    if(!function_exists($sMethodName)) {
+        echo '{}';
+        exit;
+    }
     echo $oJson->encode(array(
         'code' => 0,
         'content' => $oAdmTemplate->parseHtmlByName('mp_ctl_type_' . $sCtlType . '.html', $sMethodName($sCtlType))
+        'code' => 0,
+        'content' => $oAdmTemplate->parseHtmlByName('mp_ctl_type_' . $sCtlType . '.html', $sMethodName($sCtlType))
     ));
     exit;
 …
 function PageCodeControls($sDefault = BX_DOL_ADM_MP_CTL) {
     global $oAdmTemplate;
     $aTopMenu = array(
+    global $oAdmTemplate;
+    $aTopMenu = array(
         'ctl-type-qlinks' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeControl(this);', 'title' => _t('_adm_btn_mp_qlinks'), 'active' => $sDefault == 'qlinks' ? 1 : 0),
         //'ctl-type-browse' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeControl(this);', 'title' => _t('_adm_btn_mp_browse'), 'active' => $sDefault == 'browse' ? 1 : 0),
 …
         'ctl-type-tags' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeControl(this);', 'title' => _t('_adm_btn_mp_tags'), 'active' => $sDefault == 'tags' ? 1 : 0),
         'ctl-type-search' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeControl(this);', 'title' => _t('_adm_btn_mp_search'), 'active' => $sDefault == 'search' ? 1 : 0)
     );
+    );
     $aParams = array_merge(
         getBlockQlinks($sDefault),
         getBlockBrowse($sDefault),
         getBlockCalendar($sDefault),
         getBlockTags($sDefault),
         getBlockSearch($sDefault),
         array(
             'loading' => LoadingBox('adm-mp-controls-loading')
+        )
+        getBlockQlinks($sDefault),
+        getBlockBrowse($sDefault),
+        getBlockCalendar($sDefault),
+        getBlockTags($sDefault),
+        getBlockSearch($sDefault),
+        array(
+            'loading' => LoadingBox('adm-mp-controls-loading')
+        )
     );
     return DesignBoxAdmin(_t('_adm_box_cpt_mp_controls'), $oAdmTemplate->parseHtmlByName('mp_controls.html', $aParams), $aTopMenu);
 …
 function getBlockQlinks($sDefault) {
     global $MySQL;
     $aResult = array();
     $sBaseUrl = $GLOBALS['site']['url_admin'] . 'profiles.php?type=qlinks&value=';
     $aItems = array();
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'all' AS `by`, 'all' AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE 1 AND (`Couple`='0' OR `Couple`>`ID`)"));
 …
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'type' AS `by`, 'couple' AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Couple`<>'0' AND `Couple`>`ID`"));
     $aItems = array_merge($aItems, $MySQL->getAll("SELECT 'role' AS `by`, 'admins' AS `value`, COUNT(`ID`) AS `count` FROM `Profiles` WHERE `Role` & " . BX_DOL_ROLE_ADMIN . ""));
     foreach($aItems as $aItem)
         $aResult[] = array('link' => 'javascript:void(0)', 'on_click' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeFilterQlinks(\'' . strtolower($aItem['by']) . '\', \'' . strtolower($aItem['value']) . '\')', 'title' => _t('_adm_txt_mp_' . strtolower($aItem['value'])), 'count' => $aItem['count']);
     return array(
         'styles_qlinks' => $sDefault != 'qlinks' ? "display: none;" : "",
         'bx_repeat:content_qlinks' => $aResult
+    return array(
+        'styles_qlinks' => $sDefault != 'qlinks' ? "display: none;" : "",
+        'bx_repeat:content_qlinks' => $aResult
     );
+}
 function getBlockBrowse($sDefault) {
     return array(
         'styles_browse' => $sDefault != 'browse' ? "display: none;" : "",
         'content_browse' => ''
     );
+    return array(
+        'styles_browse' => $sDefault != 'browse' ? "display: none;" : "",
+        'content_browse' => ''
+    );
+}
 function getBlockCalendar($sDefault) {
     return array(
         'styles_calendar' => $sDefault != 'calendar' ? "display: none;" : "",
         'content_calendar' => ''
     );
+    return array(
+        'styles_calendar' => $sDefault != 'calendar' ? "display: none;" : "",
+        'content_calendar' => ''
+    );
+}
 function getBlockTags($sDefault) {
 …
     $aTags = $oTags->getTagList(array('type' => 'profile'));
     return array(
         'styles_tags' => $sDefault != 'tags' ? "display: none;" : "",
         'content_tags' => $oTags->getTagsView($aTags, BX_DOL_ADM_MP_JS_NAME . '.changeFilterTags(\'{tag}\')')
+        'styles_tags' => $sDefault != 'tags' ? "display: none;" : "",
+        'content_tags' => $oTags->getTagsView($aTags, BX_DOL_ADM_MP_JS_NAME . '.changeFilterTags(\'{tag}\')')
     );
+}
 …
                     'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeFilterSearch()'
+                )
             ),
+            ),
+        )
     );
 …
     $oForm = new BxTemplFormView($aForm);
     return array(
         'styles_search' => $sDefault != 'search' ? "display: none;" : "",
         'content_search' => $oForm->getCode()
+        'styles_search' => $sDefault != 'search' ? "display: none;" : "",
+        'content_search' => $oForm->getCode()
     );
+}
 …
         'adm-mp-deactivate' => _t('_adm_btn_mp_deactivate'),
         'adm-mp-ban' => _t('_adm_btn_mp_ban'),
         'adm-mp-unban' => _t('_adm_btn_mp_unban'),
+        'adm-mp-unban' => _t('_adm_btn_mp_unban'),
         'adm-mp-confirm' => _t('_adm_btn_mp_confirm'),
         'adm-mp-delete' => _t('_adm_btn_mp_delete'),
     );
+    );
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-mp-members-form', $aButtons, 'members');
     $aTopMenu = array(
         'view-type-simple' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeView(this);', 'title' => _t('_adm_btn_mp_simple'), 'active' => $sDefaultView == 'simple' ? 1 : 0),
         'view-type-extended' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeView(this);', 'title' => _t('_adm_btn_mp_extended'), 'active' => $sDefaultView == 'extended' ? 1 : 0),
+        'view-type-simple' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeView(this);', 'title' => _t('_adm_btn_mp_simple'), 'active' => $sDefaultView == 'simple' ? 1 : 0),
+        'view-type-extended' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeView(this);', 'title' => _t('_adm_btn_mp_extended'), 'active' => $sDefaultView == 'extended' ? 1 : 0),
         'view-type-geeky' => array('href' => 'javascript:void(0)', 'onclick' => 'javascript:' . BX_DOL_ADM_MP_JS_NAME . '.changeTypeView(this);', 'title' => _t('_adm_btn_mp_geeky'), 'active' => $sDefaultView == 'geeky' ? 1 : 0)
     );
 …
         'per_page_step' => BX_DOL_ADM_MP_PER_PAGE_STEP,
         'on_change_per_page' => BX_DOL_ADM_MP_JS_NAME . '.changePerPage(this);'
     ));
+    ));
     $aResult = array(
         'action_url' => $GLOBALS['site']['url_admin'] . 'profiles.php',
+        'action_url' => $GLOBALS['site']['url_admin'] . 'profiles.php',
         'ctl_type' => $sDefaultCtl,
         'view_type' => $sDefaultView,
 …
     foreach(array('simple', 'extended', 'geeky') as $sType)
         if($sType == $sDefaultView)
+        if($sType == $sDefaultView)
             $aResult = array_merge($aResult, array('style_' . $sType => '', 'content_' . $sType => getMembers(array('view_type' => $sType))));
         else
+        else
             $aResult = array_merge($aResult, array('style_' . $sType => 'display: none;', 'content_' . $sType => ''));
 …
         $aParams['view_per_page'] = BX_DOL_ADM_MP_PER_PAGE;
     $aParams['view_order_way'] = 'ASC';
+    $aParams['view_order_way'] = 'ASC';
     if(!isset($aParams['view_order']) || empty($aParams['view_order']))
         $aParams['view_order'] = 'ID';
     else {
         $aOrder = explode(' ', $aParams['view_order']);
         if(count($aOrder) > 1) {
             $aParams['view_order'] = $aOrder[0];
+            $aParams['view_order_way'] = $aOrder[1];
+        }
+    }
+    else {
+        $aOrder = explode(' ', $aParams['view_order']);
+        if(count($aOrder) > 1) {
+            $aParams['view_order'] = $aOrder[0];
+            $aParams['view_order_way'] = $aOrder[1];
+        }
+    }
     $sDateFormat = getLocaleFormat(BX_DOL_LOCALE_DATE, BX_DOL_LOCALE_DB);
 …
                     $sWhereClause .= " AND (`tbl`.`Time`='0' OR (`tbl`.`Time`<>'0' AND DATE_ADD(`tbl`.`DateTime`, INTERVAL `tbl`.`Time` HOUR)>NOW()))";
                     break;
                 case 'type':
+                case 'type':
                     $sWhereClause .= $aParams['ctl_params']['value'] == 'single' ? " AND `tp`.`Couple`='0'" : " AND `tp`.`Couple`<>'0' AND `tp`.`Couple`>`tp`.`ID`";
                     break;
 …
         case 'search':
             $sWhereClause .= " AND (
                 `tp`.`ID` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`NickName` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`Email` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`Headline` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`DescriptionMe` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`Tags` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`DateReg` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`ID` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`NickName` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`Email` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`Headline` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`DescriptionMe` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`Tags` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
+                `tp`.`DateReg` LIKE '%" . $aParams['ctl_params']['value'] . "%' OR
                 `tp`.`DateLastLogin` LIKE '%" . $aParams['ctl_params']['value'] . "%'
             )";
             break;
+    }
     //--- Get Paginate ---//
     $oPaginate = new BxDolPaginate(array(
 …
         'on_change_page' => BX_DOL_ADM_MP_JS_NAME . '.changePage({start})'
     ));
     $sPaginate = $oPaginate->getPaginate();
+    $sPaginate = $oPaginate->getPaginate();
     //--- Get Items ---//
     $sQuery = "
         SELECT
             `tp`.`ID` as `id`,
             `tp`.`NickName` AS `username`,
             `tp`.`Headline` AS `headline`,
             `tp`.`Sex` AS `sex`,
             `tp`.`DateOfBirth` AS `date_of_birth`,
             `tp`.`Country` AS `country`,
             `tp`.`City` AS `city`,
             `tp`.`DescriptionMe` AS `description`,
             `tp`.`Email` AS `email`,
             DATE_FORMAT(`tp`.`DateReg`,  '" . $sDateFormat . "' ) AS `registration`,
             DATE_FORMAT(`tp`.`DateLastLogin`,  '" . $sDateFormat . "' ) AS `last_login`,
             `tp`.`Status` AS `status`,
             IF(`tbl`.`Time`='0' OR DATE_ADD(`tbl`.`DateTime`, INTERVAL `tbl`.`Time` HOUR)>NOW(), 1, 0) AS `banned`,
             `tl`.`ID` AS `ml_id`,
             IF(ISNULL(`tl`.`Name`),'', `tl`.`Name`) AS `ml_name`
             " . $sSelectClause . "
         FROM `Profiles` AS `tp`
+        SELECT
+            `tp`.`ID` as `id`,
+            `tp`.`NickName` AS `username`,
+            `tp`.`Headline` AS `headline`,
+            `tp`.`Sex` AS `sex`,
+            `tp`.`DateOfBirth` AS `date_of_birth`,
+            `tp`.`Country` AS `country`,
+            `tp`.`City` AS `city`,
+            `tp`.`DescriptionMe` AS `description`,
+            `tp`.`Email` AS `email`,
+            DATE_FORMAT(`tp`.`DateReg`,  '" . $sDateFormat . "' ) AS `registration`,
+            DATE_FORMAT(`tp`.`DateLastLogin`,  '" . $sDateFormat . "' ) AS `last_login`,
+            `tp`.`Status` AS `status`,
+            IF(`tbl`.`Time`='0' OR DATE_ADD(`tbl`.`DateTime`, INTERVAL `tbl`.`Time` HOUR)>NOW(), 1, 0) AS `banned`,
+            `tl`.`ID` AS `ml_id`,
+            IF(ISNULL(`tl`.`Name`),'', `tl`.`Name`) AS `ml_name`
+            " . $sSelectClause . "
+        FROM `Profiles` AS `tp`
         LEFT JOIN `sys_admin_ban_list` AS `tbl` ON `tp`.`ID`=`tbl`.`ProfID`
         LEFT JOIN `sys_acl_levels_members` AS `tlm` ON `tp`.`ID`=`tlm`.`IDMember` AND `tlm`.`DateStarts` < NOW() AND (`tlm`.`DateExpires`>NOW() || ISNULL(`tlm`.`DateExpires`))
         LEFT JOIN `sys_acl_levels` AS `tl` ON `tlm`.`IDLevel`=`tl`.`ID`
         " . $sJoinClause . "
         WHERE
 AND (`tp`.`Couple`=0 OR `tp`.`Couple`>`tp`.`ID`)" . $sWhereClause . "
         " . $sGroupClause . "
         ORDER BY `tp`.`" . $aParams['view_order'] . "` " . $aParams['view_order_way'] . "
         LIMIT " . $aParams['view_start'] . ", " . $aParams['view_per_page'];
+        LEFT JOIN `sys_acl_levels_members` AS `tlm` ON `tp`.`ID`=`tlm`.`IDMember` AND `tlm`.`DateStarts` < NOW() AND (`tlm`.`DateExpires`>NOW() || ISNULL(`tlm`.`DateExpires`))
+        LEFT JOIN `sys_acl_levels` AS `tl` ON `tlm`.`IDLevel`=`tl`.`ID`
+        " . $sJoinClause . "
+        WHERE
+AND (`tp`.`Couple`=0 OR `tp`.`Couple`>`tp`.`ID`)" . $sWhereClause . "
+        " . $sGroupClause . "
+        ORDER BY `tp`.`" . $aParams['view_order'] . "` " . $aParams['view_order_way'] . "
+        LIMIT " . $aParams['view_start'] . ", " . $aParams['view_per_page'];
     $aProfiles = $GLOBALS['MySQL']->getAll($sQuery);
     //--- Display ---//
     $sFunction = 'getMembers' . ucfirst($aParams['view_type']);
 …
 function getMembersGeeky($aProfiles, $sPaginate) {
     $iEmailLength = 20;
+    $iEmailLength = 20;
     $aItems = array();
     foreach($aProfiles as $aProfile){
 …
             'edit_class' => (int)$aProfile['banned'] == 1 ? 'adm-mp-banned' : ($aProfile['status'] != 'Active' ? 'adm-mp-inactive' : 'adm-mp-active'),
             'registration' => $aProfile['registration'],
             'last_login' => $aProfile['last_login'],
+            'last_login' => $aProfile['last_login'],
             'status' => $aProfile['status'],
             'ml_id' => !empty($aProfile['ml_id']) ? (int)$aProfile['ml_id'] : 2,
 …
         );
+    }
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('mp_members_geeky.html', array(
         'bx_repeat:items' => array_values($aItems),
 …
             'username' => $aProfile['username']
         );
     return $GLOBALS['oAdmTemplate']->parseHtmlByName('mp_members_simple.html', array(
         'bx_repeat:items' => array_values($aItems),

trunk/administration/settings.php

-                      r15201
+                      r15211
 * This file is part of Dolphin - Smart Community Builder
+*
 * Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
+* Dolphin is free software. This work is licensed under a Creative Commons Attribution 3.0 License.
 * http://creativecommons.org/licenses/by/3.0/
+*
 * Dolphin 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 Creative Commons Attribution 3.0 License for more details.
 * You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
+* See the Creative Commons Attribution 3.0 License for more details.
+* You should have received a copy of the Creative Commons Attribution 3.0 License along with Dolphin,
 * see license.txt file; if not, write to marketing@boonex.com
 ***************************************************************************/
 …
 $mixedCategory = 0;
 if(bx_get('cat') !== false)
     $mixedCategory = bx_get('cat');
+    $mixedCategory = bx_get('cat');
 $oSettings = new BxDolAdminSettings($mixedCategory);
 …
 $_page_cont[$iNameIndex]['page_main_code'] = $oSettings->getForm();
 if (26 == $mixedCategory) {
     define('BX_PROMO_CODE', adm_hosting_promo());
+    define('BX_PROMO_CODE', adm_hosting_promo());
+}

trunk/administration/templates/base/_footer.html

r10490	r15211
1		<bx_injection:injection_footer />
	1	<bx_injection:injection_footer />
2	2	</body>
3	3	</html>

trunk/administration/templates/base/_header.html

-                      r15201
+                      r15211
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=__page_charset__" />
         <title>__page_header__</title>
+        <title>__page_header__</title>
         <bx_include_css />
 …
             var site_url = '<bx_url_root />';
             var glUserInfoDisabled = 'yes';
         </script>
+        </script>
         __extra_js__

trunk/administration/templates/base/_sub_header.html

-                      r15201
+                      r15211
         <div id="bx-logo-container" class="bx-def-margin-top">
                 <img src="<bx_image_url:logo.png />" />
+                <img src="<bx_image_url:logo.png />" />
         </div>
 …
         <div class="bx-def-margin-top">
             <table id="bx-admin-page-table">
                 <tr>
                     <td class="bx-adm-middle-menu">
+            <table id="bx-admin-page-table">
+                <tr>
+                    <td class="bx-adm-middle-menu">
                         __main_menu__
                         __boonex_promo__
                     </td>
                     <td class="bx-adm-middle-main" id="main_cont">
+                    </td>
+                    <td class="bx-adm-middle-main" id="main_cont">
                         <div id="bx-adm-page-content-container" class="bx-def-padding-left">
                             <div class="bx-def-padding-bottom">
                                 <h1 id="bx-adm-page-header">__page_header__</h1>
                             </div>
+                                <h1 id="bx-adm-page-header">__page_header__</h1>
+                            </div>
                             <div id="bx-adm-page-content">
+                            <div id="bx-adm-page-content">

trunk/administration/templates/base/antispam_dnsbl_recheck.html

-                      r15201
+                      r15211
                 var iId = m[1];
                 var eStatus = this;
                 $(this).html('Checking...');
+                $(this).html('Checking...');
                 $.post('__admin_url__antispam.php', {action: '__action__', id: iId, 'test': sTest}, function (sRet) {
                     if ('LISTED' == sRet) {
                         $(eStatus).html('__txt_listed__');
+                        $(eStatus).html('__txt_listed__');
+                    }
                     else if ('NOT LISTED' == sRet) {
 …
             </tr>
         </bx_repeat:items>
     </table>
+    </table>
 </div>

trunk/administration/templates/base/antispam_manage_dnsbl.html

r15201	r15211
32	32	</tr>
33	33	</bx_repeat:items>
34
	34
35	35	</table>
36	36	__controls__

trunk/administration/templates/base/boonex_promo.html

-                      r15201
+                      r15211
 <div class="bx-adm-boonex-promo bx-def-padding bx-def-border bx-def-margin-top">
     <div>
         <a target="_blank" href="http://www.boonex.com/payment.php"><bx_text:_adm_txt_boonex_promo_title /></a>
         <bx_text:_adm_txt_boonex_promo_text />
     </div>
+    <div>
+        <a target="_blank" href="http://www.boonex.com/payment.php"><bx_text:_adm_txt_boonex_promo_title /></a>
+        <bx_text:_adm_txt_boonex_promo_text />
+    </div>
 </div>

trunk/administration/templates/base/categories.html

-                      r15201
+                      r15211
 <div class="adm-category-items">
     <bx_repeat:items>
         <div class="adm-category-item">
             <img src="__icon__" />
             <div class="adm-ci-link"><a href="__link__" __onclick__>__title__</a></div>
             <div class="adm-ci-description">__description__</div>
+        <div class="adm-category-item">
+            <img src="__icon__" />
+            <div class="adm-ci-link"><a href="__link__" __onclick__>__title__</a></div>
+            <div class="adm-ci-description">__description__</div>
         </div>
     </bx_repeat:items>

trunk/administration/templates/base/css/activityTrac.css

-                      r15201
+                      r15211
 .alertUnit {
     position: relative;
     width: 600px;
     margin: 5px 0px 5px 0px;
+    position: relative;
+    width: 600px;
+    margin: 5px 0px 5px 0px;
+}
 .alertUnit div {
     text-align: center;
     position: relative;
     float: left;
+    text-align: center;
+    position: relative;
+    float: left;
+}
 .alertRcpt {
     width: 60px;
+    width: 60px;
+}
 .alertMessage {
     width: 340px;
+    width: 340px;
+}
 .alertDate {
     width: 120px;
+    width: 120px;
+}

trunk/administration/templates/base/css/admin.css

-                      r15201
+                      r15211
 table#bx-admin-page-table {
    border-collapse:collapse;
+   border-collapse:collapse;
+}
 …
+}
 td.bx-adm-middle-menu {
     width: 300px;
+    border: 0px;
+td.bx-adm-middle-menu {
+    width: 300px;
+    border: 0px;
+}
 …
 div.menu_categ_hover_header {
     height: 44px;
     padding-left: 44px;
+    padding-left: 44px;
+    z-index: 5;
+    z-index: 5;
     border:1px solid #ddd;
     background-color:#fff;
     line-height: 44px;
     font-size: 16px;
     font-weight: bold;
+    line-height: 44px;
+    font-size: 16px;
+    font-weight: bold;
+}
 div.adm-mmh-hover {
     border:1px solid #999;
+    border:1px solid #999;
+}
 div.adm-mmh-active {
     border:1px solid #ccc;
+    border:1px solid #ccc;
+}
 div.adm-mmh-opened {
     border:1px solid #ccc;
+    border:1px solid #ccc;
+}
 img.adm-menu-icon {
     top: -5px;
     left: 7px;
+    left: 7px;
+    position: absolute;
     z-index: 10;
+    position: absolute;
+    z-index: 10;
+}
 …
     width: 17px;
     height: 17px;
     position: absolute;
+    z-index: 5;
     background-image: url(../images/mm_item_arrow_bg.png);
     background-repeat: no-repeat;
     background-position: 0px 0px;
     cursor:pointer;
+    position: absolute;
+    z-index: 5;
+    background-image: url(../images/mm_item_arrow_bg.png);
+    background-repeat: no-repeat;
+    background-position: 0px 0px;
+    cursor:pointer;
+}
 img.adm-mma-opened {
 …
     padding: 5px 0px;
     border: 1px solid #ccc;
     border-top: none;
+    border: 1px solid #ccc;
+    border-top: none;
     background-color: #f6f6f6;
     position: relative;
     z-index: 1;
     display: none;
+    font-size: 13px;
     color: black;
+    position: relative;
+    z-index: 1;
+    display: none;
+    font-size: 13px;
+    color: black;
+}
 div.adm-mmi-opened {
 …
 div.adm-menu-item-wrapper {
     height: 26px;
     padding-left: 33px;
     position: relative;
+    padding-left: 33px;
+    position: relative;
     line-height: 26px;
 …
 img.adm-menu-item-icon {
     top: 5px;
     left: 9px;
     width: 16px;
     height: 16px;
+    position: absolute;
     z-index: 5;
+    left: 9px;
+    width: 16px;
+    height: 16px;
+    position: absolute;
+    z-index: 5;
+}

trunk/administration/templates/base/css/anchor.css

r15201	r15211
2	2
3	3	a, a:link {
4		color:#3333CC;
5		font-family:Verdana,Arial;
	4	color:#3333CC;
	5	font-family:Verdana,Arial;
6	6	}
7	7	a:visited {
8		color:#000099;
	8	color:#000099;
9	9	}
10	10
11	11	a:hover, a:active {
12		color:#3333CC;
	12	color:#3333CC;
13	13	}
14	14
15	15	a, a:link, a:visited, a:active {
16		text-decoration:none;
	16	text-decoration:none;
17	17	}
18	18	a:hover {
19		text-decoration:underline;
	19	text-decoration:underline;
20	20	}

trunk/administration/templates/base/css/dashboard.css

-                      r15201
+                      r15211
     position: relative;
     float: left;
+    float: left;
+}
 div.adm-dashboard-item {
 …
     height: 73px;
     margin-bottom: 10px;
     position: relative;
 …
     width: 73px;
     height: 73px;
     position: absolute;
     background-repeat: no-repeat;
     background-position: center;
+}
 div.adm-di-title,
+div.adm-di-title,
 div.adm-di-content {
     margin: 0px 10px 0px 73px;

trunk/administration/templates/base/css/fields.css

-                      r15201
+                      r15211
 #main_container {}
 #tabs_container {
     position:relative;
+    position:relative;
+}
 …
 #mode_switcher_2 ul,
 #mode_switcher_3 ul {
     margin: 0px;
     padding: 5px;
+    list-style: none;
+    margin: 0px;
+    padding: 5px;
+    list-style: none;
+}
 …
 #mode_switcher_3 ul li {
     margin:0px;
     float:left;
     line-height: 14px;
+    float:left;
+    line-height: 14px;
+}
 …
 #mode_switcher_2 ul li a ,
 #mode_switcher_3 ul li a {
     cursor:default;
     padding:3px 7px 3px 18px;
     font-size:12px;
     display:block;
     background-position:3px 3px;
     background-repeat:no-repeat;
     background-image:url(../images/radio.gif);
+    cursor:default;
+    padding:3px 7px 3px 18px;
+    font-size:12px;
+    display:block;
+    background-position:3px 3px;
+    background-repeat:no-repeat;
+    background-image:url(../images/radio.gif);
+}
 …
 #mode_switcher_3 ul li a:active,
 #mode_switcher_3 ul li a:visited {
     color:#000000;
     text-decoration:none;
+    color:#000000;
+    text-decoration:none;
+}
 …
 #mode_switcher_3 ul li.ui-tabs-selected a
+{
     background-image:url(../images/radio_active.gif);
+    background-image:url(../images/radio_active.gif);
+}
 …
 .build_container {
     padding:15px;
     font-size:11px;
+    padding:15px;
+    font-size:11px;
+}
 .build_zone_header {
     font-weight:bold;
+    font-weight:bold;
+}
 .blocks_cont_bord {
     border:1px solid #cccccc;
+    border:1px solid #cccccc;
+}
 .blocks_container {
     background-color:#ffffff;
     padding:6px;
+    background-color:#ffffff;
+    padding:6px;
+}
 …
 .build_block,
 .build_block_inactive {
     width:142px;
     float:left;
     margin-left:2px;
     margin-right:2px;
     /*position:relative;*/
+    width:142px;
+    float:left;
+    margin-left:2px;
+    margin-right:2px;
+    /*position:relative;*/
+}
 .build_block_header {
     padding-top:7px;
     height:21px;
     background-image:url(../images/block_header.gif);
     text-align:center;
     color:#999999;
     cursor:move;
     margin-top:2px;
     margin-bottom:2px;
     background-repeat:no-repeat;
+    padding-top:7px;
+    height:21px;
+    background-image:url(../images/block_header.gif);
+    text-align:center;
+    color:#999999;
+    cursor:move;
+    margin-top:2px;
+    margin-bottom:2px;
+    background-repeat:no-repeat;
+}
 .build_block_hover {
     border: 1px dotted #999999;
+    border: 1px dotted #999999;
+}
 …
 .build_item_active {
     width:117px;
     height:21px;
     padding-left:25px;
     padding-top:7px;
     background-image:url(../images/block_item_bg.gif);
     color: #6666cc;
     margin-top:2px;
     margin-bottom:2px;
     cursor:move;
+    width:117px;
+    height:21px;
+    padding-left:25px;
+    padding-top:7px;
+    background-image:url(../images/block_item_bg.gif);
+    color: #6666cc;
+    margin-top:2px;
+    margin-bottom:2px;
+    cursor:move;
+}
 .build_item_hover {
     border: 1px dotted #999999;
+    border: 1px dotted #999999;
+}
 …
 .build_item_fake,
 .build_block_fake {
     height:2px;
     font-size:1px;
     /*background-color:yellow;*/
+    height:2px;
+    font-size:1px;
+    /*background-color:yellow;*/
+}
 .build_inac_items_col {
     width:142px;
     margin-left:2px;
     margin-right:2px;
     float:left;
     min-height:1px;
     position:relative;
     /*background-color:red;*/
+    width:142px;
+    margin-left:2px;
+    margin-right:2px;
+    float:left;
+    min-height:1px;
+    position:relative;
+    /*background-color:red;*/
+}
 .build_block_inactive_items {
     width:744px;
+    width:744px;
+}
 *html .build_block_inactive_items {
     width:748px;
+    width:748px;
+}
 …
 .ui-tabs-container {
     clear:both;
+    clear:both;
+}
 .ui-tabs-hide {
     display:none;
+    display:none;
+}
 …
 #fieldFormWrap {
     background-image:url(../images/sp_op.png);
     position:absolute;
     z-index:100;
+    background-image:url(../images/sp_op.png);
+    position:absolute;
+    z-index:100;
+}
 * html #fieldFormWrap
+{
     background-image:url( ../images/spacer.gif );
     filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op.png', sizingMethod='scale');
+    background-image:url( ../images/spacer.gif );
+    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op.png', sizingMethod='scale');
+}
 #edit_form_cont {
     position:relative;
+    position:relative;
     z-index: 1000;
+}
 .notify_msg {
     color:green;
     text-align:center;
+    color:green;
+    text-align:center;
+}
 .error_msg {
     color:red;
     text-align:center;
+    color:red;
+    text-align:center;
+}
 …
 .popup_form_wrapper
+{
     border-collapse:collapse;
     margin:0px;
     padding:0px;
     width:482px;
+    border-collapse:collapse;
+    margin:0px;
+    padding:0px;
+    width:482px;
+}
 .popup_form_wrapper td
+{
     padding:0px;
     margin:0px;
+    padding:0px;
+    margin:0px;
+}
 .popup_form_wrapper td.corner
+{
     width:16px;
     height:16px;
     font-size:1px;
+    width:16px;
+    height:16px;
+    font-size:1px;
+}
 .popup_form_wrapper td.side
+{
     width:16px;
+    width:16px;
+}
 .popup_form_wrapper td.side_ver
+{
     height:16px;
+    height:16px;
+}
 …
 .popup_form_wrapper td.side
+{
     background-image:url(../images/sp_op_gr.png);
     font-size:1px;
+    background-image:url(../images/sp_op_gr.png);
+    font-size:1px;
+}
 …
 * html .popup_form_wrapper td.side
+{
     background-image:url( ../images/spacer.gif );
     filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op_gr.png', sizingMethod='scale');
+    background-image:url( ../images/spacer.gif );
+    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op_gr.png', sizingMethod='scale');
+}
 …
 .popup_form_wrapper td.container
+{
     background-color:white;
     width:450px;
+    background-color:white;
+    width:450px;
+}
 .edit_item_table_cont
+{
+    position:relative;
+    position:relative;
+}
 …
 .field_edit_tab {
     border-collapse:collapse;
     width:100%;
+    border-collapse:collapse;
+    width:100%;
+}
 .field_edit_tab td.label {
     width:40%;
     text-align:right;
     font-weight:bold;
     padding:5px;
     vertical-align:center;
+    width:40%;
+    text-align:right;
+    font-weight:bold;
+    padding:5px;
+    vertical-align:center;
+}
 .field_edit_tab td.warned {
     background-color:#f20000;
+    background-color:#f20000;
+}
 .field_edit_tab td.value {
     width:40%;
     text-align:left;
     padding:5px;
     vertical-align:center;
+    width:40%;
+    text-align:left;
+    padding:5px;
+    vertical-align:center;
+}
 .field_edit_tab td.info {
     width:20%;
     text-align:left;
     padding:5px;
     vertical-align:center;
+    width:20%;
+    text-align:left;
+    padding:5px;
+    vertical-align:center;
+}
 .field_edit_tab td.buttons {
     text-align:center;
+    text-align:center;
+}
 .field_edit_tab td.buttons input {
     margin:5px;
+    margin:5px;
+}
 …
 .field_edit_tab select.select_type,
 .field_edit_tab textarea.input_text {
     width:170px;
     border:1px solid #ccc;
+    width:170px;
+    border:1px solid #ccc;
+}
 .field_edit_tab select.select_page {
     border: 1px solid #ccc;
     width: 45px;
+    border: 1px solid #ccc;
+    width: 45px;
+}
 input.input_checkbox {
     /*border:1px solid #ccc;*/
+    /*border:1px solid #ccc;*/
+}
 .field_edit_tab select.select_multiple {
     width:170px;
     height:75px;
     border:1px solid #ccc;
+    width:170px;
+    height:75px;
+    border:1px solid #ccc;
+}
 .field_edit_tab textarea.input_text {
     height:62px;
     font-family: Arial,Helvetica,sans-serif;
     font-size:12px;
+    height:62px;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size:12px;
+}
 img.info_icon,
 img.depr_icon {
     width: 16px;
     height:16px;
     cursor:help;
     margin:2px;
+    width: 16px;
+    height:16px;
+    cursor:help;
+    margin:2px;
+}
 …
 ul#form_tabs_switcher {
     margin:0px;
     margin-bottom:3px;
     padding:0px;
     border-bottom:1px solid #ccc;
     list-style:none;
     height:25px;
+    margin:0px;
+    margin-bottom:3px;
+    padding:0px;
+    border-bottom:1px solid #ccc;
+    list-style:none;
+    height:25px;
+}
 ul#form_tabs_switcher li {
     float:left;
     padding:5px;
+    float:left;
+    padding:5px;
+}
 ul#form_tabs_switcher li.ui-tabs-selected {
     background-color:#ccc;
+}
+    background-color:#ccc;
+}

trunk/administration/templates/base/css/general.css

-                      r15201
+                      r15211
+}
 div#FloatDesc {
     position:absolute;
     display:none;
     z-index:10000;
     background-color:#ffffe0;
     border:1px solid #000000;
     padding:3px;
     width:180px;
+    position:absolute;
+    display:none;
+    z-index:10000;
+    background-color:#ffffe0;
+    border:1px solid #000000;
+    padding:3px;
+    width:180px;
+}
 form, p {
     margin:0px;
     padding:0px;
+    margin:0px;
+    padding:0px;
+}
 a img {
     border:none;
+    border:none;
+}
 .err {
     color: #FF0000;
+    color: #FF0000;
+}
 /*--- Top Header ---*/
 div.adm-header {
     height: 87px;
+    position: relative;
+    height: 87px;
+    position: relative;
     border-bottom: 1px solid #c8c8c8;
     background-image: url(../images/header_bg.png);
     background-repeat: repeat-x;
+    background-position: 0px 0px;
+    background-image: url(../images/header_bg.png);
+    background-repeat: repeat-x;
+    background-position: 0px 0px;
+}
 div.adm-header-content {
 …
+}
 img.adm-header-logo {
     top: 0px;
     left: 0px;
     width: 105px;
     height: 116px;
     position:absolute;
+img.adm-header-logo {
+    top: 0px;
+    left: 0px;
+    width: 105px;
+    height: 116px;
+    position:absolute;
+}
 div.adm-header-title {
 …
     position: relative;
     float: left;
     line-height: 87px;
+    line-height: 87px;
     font-family: Copperplate Gothic Bold;
     font-size: 48px;
     font-weight: bold;
     color: #333333;
+    font-size: 48px;
+    font-weight: bold;
+    color: #333333;
+}
 div.adm-header-verion {
 …
     height: 10px;
     position: absolute;
     line-height: 9px;
     font-family: Verdana;
 …
     margin: 0px;
     padding: 0px;
     display: block;
 …
 table.adm-middle {
     width: 900px;
     margin: 0px auto;
     padding: 0px;
     border: 0px;
+    margin: 0px auto;
+    padding: 0px;
+    border: 0px;
+}
 td.adm-middle-menu {
     width: 214px;
     padding: 0px;
     margin: 0px;
     border: 0px;
     vertical-align: top;
+    width: 214px;
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    vertical-align: top;
+}
 td.adm-middle-main {
     padding: 0px;
     margin: 0px;
     background-repeat: no-repeat;
     background-position: 470px 0px;
     vertical-align: top;
+    margin: 0px;
+    background-repeat: no-repeat;
+    background-position: 470px 0px;
+    vertical-align: top;
+}
 div.adm-page-header {
     margin: 0px 0px 20px 34px;
     font-weight: bold;
     font-size: 30px;
+    font-weight: bold;
+    font-size: 30px;
+}
 div.adm-page-content {
     margin: 0px 0px 0px 34px;
+    margin: 0px 0px 0px 34px;
+}
 …
 /*--- Footer Part ---*/
 div.adm-footer {
     position:relative;
+    height: 73px;
     background-color: #6e6e6e;
     background-repeat: repeat-x;
     background-image: url(../images/bottom_bord.gif);
     font-size: 14px;
     line-height: 20px;
     color: #ffffff;
+    position:relative;
+    height: 73px;
+    background-color: #6e6e6e;
+    background-repeat: repeat-x;
+    background-image: url(../images/bottom_bord.gif);
+    font-size: 14px;
+    line-height: 20px;
+    color: #ffffff;
+}
 .adm-footer-logo {
+    position:absolute;
+    top:20px;
     right:20px;
+    position:absolute;
+    top:20px;
+    right:20px;
+}
 div.adm-footer-content {
 …
 div.adm-footer a:hover,
 div.adm-footer a:active {
     color:#ffffff;
+    color:#ffffff;
+}
 …
 /*--- DesignBox ---*/
 div.adm-design-box {
     margin-bottom: 10px;
     border: 1px solid #CCC;
     background-image: url(../images/head_bg.gif);
     background-repeat: repeat-x;
     background-color: #fff;
+    margin-bottom: 10px;
+    border: 1px solid #CCC;
+    background-image: url(../images/head_bg.gif);
+    background-repeat: repeat-x;
+    background-color: #fff;
+}
 div.adm-db-head {
+    height: 28px;
     position: relative;
     border-bottom: 1px solid #ccc;
     line-height: 28px;
     text-indent: 10px;
     text-align: left;
     text-transform: capitalize;
+    font-size: 12px;
     font-weight: bold;
     font-family: Verdana,Arial;
+    color: #333;
+    height: 28px;
+    position: relative;
+    border-bottom: 1px solid #ccc;
+    line-height: 28px;
+    text-indent: 10px;
+    text-align: left;
+    text-transform: capitalize;
+    font-size: 12px;
+    font-weight: bold;
+    font-family: Verdana,Arial;
+    color: #333;
+}
 div.adm-db-content {
     padding: 1px;
     font-size: 11px;
+    padding: 1px;
+    font-size: 11px;
+}
 div.adm-db-control-panel {
     height: 30px;
     background-color: #ededed;
     line-height: 30px;
     font-size: 11px;
+}
 div.adm-db-content-wrapper {
     padding: 9px;
     position: relative;
+    padding: 9px;
+    position: relative;
+}
 div.adm-design-box div.adm-db-head .dbTopMenu {
     top: 0px;
     right: 1px;
     position: absolute;
     text-transform: capitalize;
     text-indent: 0px;
     white-space: nowrap;
     font-size: 11px;
     font-weight: bold;
     color: #333;
+}
 .dbTopMenu div.active,
+    right: 1px;
+    position: absolute;
+    text-transform: capitalize;
+    text-indent: 0px;
+    white-space: nowrap;
+    font-size: 11px;
+    font-weight: bold;
+    color: #333;
+}
+.dbTopMenu div.active,
 .dbTopMenu div.notActive {
     float: left;
     padding: 0px 5px;
     border-left: 0px solid #ccc;
     height: 28px;
     line-height: 28px;
     position: relative;
     font-weight: normal;
+    float: left;
+    padding: 0px 5px;
+    border-left: 0px solid #ccc;
+    height: 28px;
+    line-height: 28px;
+    position: relative;
+    font-weight: normal;
+}
 .dbTopMenu div a,
 …
 .dbTopMenu div a:active,
 .dbTopMenu div a:visited {
     color: #666;
     font-family:Verdana,Arial;
     font-size:11px;
+    color: #666;
+    font-family:Verdana,Arial;
+    font-size:11px;
+}
 .dbTopMenu div.active {
     background:transparent url(../images/head_ti_left.gif) no-repeat scroll 0%;
     cursor:pointer;
     display:block;
     float:left;
     height:28px;
     line-height:28px;
     padding:0pt 0pt 0pt 5px;
+    background:transparent url(../images/head_ti_left.gif) no-repeat scroll 0%;
+    cursor:pointer;
+    display:block;
+    float:left;
+    height:28px;
+    line-height:28px;
+    padding:0pt 0pt 0pt 5px;
+}
 .dbTopMenu .active span {
     background:transparent url(../images/head_ti_right.gif) repeat-y scroll right top;
     display:block;
     float:left;
     height:28px;
     padding:0pt 5px 0pt 0px;
+    background:transparent url(../images/head_ti_right.gif) repeat-y scroll right top;
+    display:block;
+    float:left;
+    height:28px;
+    padding:0pt 5px 0pt 0px;
+}
 div.adm-db-head div.notActiveIcon {
     background-position: 0px 5px;
     background-repeat: no-repeat;
     padding-left: 18px;
+    background-position: 0px 5px;
+    background-repeat: no-repeat;
+    padding-left: 18px;
+}
 div.adm-design-box div.adm-db-close {
 …
 /* top settings */
 div.top_settings_block
+div.top_settings_block
+{
     background-color:#EDEDED;
     height:30px;
     width:100%;
     color:#666666;
+}
 div.top_settings_block div.ordered_block
+    background-color:#EDEDED;
+    height:30px;
+    width:100%;
+    color:#666666;
+}
+div.top_settings_block div.ordered_block
+{
     padding-top:5px;
     padding-left:9px;
     float:left;
+}
 div.top_settings_block div.per_page_block
+    padding-top:5px;
+    padding-left:9px;
+    float:left;
+}
+div.top_settings_block div.per_page_block
+{
     padding-top:5px;
     float:right;
     padding-right:9px;
+    padding-top:5px;
+    float:right;
+    padding-right:9px;
+}
 …
+}
 .sys-adm-enabled {
+.sys-adm-enabled {
     color:#fff;
     background-color:#0b0;
+}
 .sys-adm-disabled {
+.sys-adm-disabled {
     color:#fff;
     background-color:#d00;

trunk/administration/templates/base/css/index.css

-                      r15201
+                      r15211
+}
 div.adm-category-item {
+    position: relative;
     margin-bottom: 10px;
+    position: relative;
+    margin-bottom: 10px;
+}
 div.adm-category-item img {
     top: 3px;
     left: 7px;
+    position: absolute;
+    left: 7px;
+    position: absolute;
+}
 div.adm-ci-link {
     margin-left: 35px;
     line-height: 20px;
     font-size: 18px;
+    font-weight: bold;
+    margin-left: 35px;
+    line-height: 20px;
+    font-size: 18px;
+    font-weight: bold;
+}
 div.adm-ci-description {
     margin-left: 35px;
+    margin-left: 35px;
     font-size: 13px;
+    font-size: 13px;
+}
 …
+}
 div.adm-news-item {
     padding-bottom: 8px;
+    padding-bottom: 8px;
+}
 /*div.adm-ni-title {
     font-size: 12px;
+    font-size: 12px;
     font-weight:bold;
     color: #3333cc;
+    color: #3333cc;
 }*/
 div.adm-ni-title a,
 …
+}
 span.adm-ni-date {
     color: #999999;
+    color: #999999;
     display:block;
     font-size:9px;

trunk/administration/templates/base/css/lang_file.css

-                      r15201
+                      r15211
 div.adm-lk-chb-apply {
     position: relative;
     float: left;
+    float: left;
+}
 div.adm-lk-btn-new {
 …
 div.adm-lk-keys {
     margin: 10px;
     padding: 0px;
+    padding: 0px;
+}
 div.adm-lk-key {
 …
 div#adm-langs-add-key,
 div#adm-langs-edit-key {
     width: 562px;
+    width: 562px;
+}
 div#adm-langs-add-key table.popup_form_wrapper,
 …
     width: 480px;
     height: 295px;
     position: relative;
+    position: relative;
     overflow-y: scroll;
     overflow-x: hidden;
+    overflow-x: hidden;
+}
 div#adm-langs-add-key-content table.form_advanced_table,
 …
 div#adm-langs-add-key-content table.form_advanced_table tr,
 div#adm-langs-edit-key-content table.form_advanced_table tr {
     width: 478px;
     overflow: hidden;
+    width: 478px;
+    overflow: hidden;
+}

trunk/administration/templates/base/css/login.css

-                      r15201
+                      r15211
 a img {
     border: none;
+    border: none;
+}
 …
 .admin_login_wrapper {
     background-image: url(../images/admin_login_bg.png);
     background-repeat: no-repeat;
     width: 680px;
     height: 400px;
+    background-image: url(../images/admin_login_bg.png);
+    background-repeat: no-repeat;
+    width: 680px;
+    height: 400px;
     position:absolute;
     top:50%;
 …
     margin-left:-340px;
     margin-top:-146px;
     overflow: hidden;
     color: #333333;
+    overflow: hidden;
+    color: #333333;
+}
 …
 .admin_login_wrapper a:visited
+{
     color: #3333cc;
     text-decoration: none;
+    color: #3333cc;
+    text-decoration: none;
+}
 …
 .admin_login_wrapper a:active
+{
     text-decoration: underline;
+    text-decoration: underline;
+}
 .admin_login_icon {
     width: 159px;
     height: 200px;
     float: right;
     margin-right: 45px;
     margin-top: 40px;
     position: relative;
+    width: 159px;
+    height: 200px;
+    float: right;
+    margin-right: 45px;
+    margin-top: 40px;
+    position: relative;
+}
 .admin_login_form_wrapper {
     margin-top: 50px;
     margin-left: 35px;
+    margin-top: 50px;
+    margin-left: 35px;
+}
 .admin_license_form_wrapper {
     margin-left: 15px;
     margin-top: 25px;
+    margin-left: 15px;
+    margin-top: 25px;
+}
 .admin_login_table td {
     vertical-align: middle;
+    vertical-align: middle;
+}
 .admin_login_table td.value {
     text-align: right;
+    text-align: right;
+}
 …
 #admin_login_license
+{
     border: none;
     background-image: url(../images/admin_login_input.png);
     background-repeat: no-repeat;
     width: 251px;
     height: 23px;
     background-color: transparent;
     vertical-align: middle;
     padding: 10px;
+    border: none;
+    background-image: url(../images/admin_login_input.png);
+    background-repeat: no-repeat;
+    width: 251px;
+    height: 23px;
+    background-color: transparent;
+    vertical-align: middle;
+    padding: 10px;
+}
 #admin_login_license {
     background-image: url(../images/admin_login_input_long.png);
     width: 484px;
+    background-image: url(../images/admin_login_input_long.png);
+    width: 484px;
+}
 #admin_login_remember {
     width: 21px;
     height: 21px;
     vertical-align: middle;
+    width: 21px;
+    height: 21px;
+    vertical-align: middle;
+}
 .remember_me_row label
+{
     vertical-align: middle;
+    vertical-align: middle;
+}
 #admin_login_form_submit {
     width: 97px;
     height: 31px;
     color: #666666;
     background-repeat: no-repeat;
     background-image: url(../images/admin_login_button.png);
     background-color: transparent;
     border: none;
     background-position: left top;
     overflow: visible;
+    width: 97px;
+    height: 31px;
+    color: #666666;
+    background-repeat: no-repeat;
+    background-image: url(../images/admin_login_button.png);
+    background-color: transparent;
+    border: none;
+    background-position: left top;
+    overflow: visible;
+}
 #admin_login_form_submit:hover {
     background-position: left -33px;
+    background-position: left -33px;
+}
 #admin_login_form_submit:focus {
     background-position: left -66px;
+    background-position: left -66px;
+}
 .admin_login_footers {
     position: fixed;
     bottom: 0px;
     left: 0px;
     width: 100%;
     height: 54px;
+    position: fixed;
+    bottom: 0px;
+    left: 0px;
+    width: 100%;
+    height: 54px;
+}
 .admin_login_footers .left_banner {
     float: left;
     position: relative;
     margin-left: 30px;
+    float: left;
+    position: relative;
+    margin-left: 30px;
+}
 .admin_login_footers .right_banner {
     float: right;
     position: relative;
     margin-right: 30px;
+    float: right;
+    position: relative;
+    margin-right: 30px;
+}

trunk/administration/templates/base/css/memb_levels.css

r15201	r15211
35	35	/--- 'Manage Action' section ---/
36	36	div.calendar {
37		z-index: 9999;
	37	z-index: 9999;
38	38	}
39	39	div#adm-mlevels-action{
40		width: 562px;
	40	width: 562px;
41	41	}
42	42	div#adm-mlevels-action table.popup_form_wrapper,
…	…
58	58	}
59	59	div.ui-datepicker {
60		z-index: 9999;
	60	z-index: 9999;
61	61	}

trunk/administration/templates/base/css/menu_compose.css

r15201	r15211
12	12	/position: relative;/
13	13
14		cursor:default;
	14	cursor:default;
15	15	}
16	16
…	…
21	21	.inactive_item
22	22	{
23		position:absolute;
24		width:92px;
25		height:21px;
26		color: #6666CC;
27		font-size:11px;
	23	position:absolute;
	24	width:92px;
	25	height:21px;
	26	color: #6666CC;
	27	font-size:11px;
28	28	}
29	29
30	30	#mov_indic
31	31	{
32		padding-left:23px;
33		padding-top:5px;
34		border: 1px dashed #999;
	32	padding-left:23px;
	33	padding-top:5px;
	34	border: 1px dashed #999;
35	35	}
36	36
…	…
40	40	.inactive_item
41	41	{
42		cursor:move;
43		padding: 7px 5px 0px 20px;
44		overflow:hidden;
45		white-space:nowrap;
	42	cursor:move;
	43	padding: 7px 5px 0px 20px;
	44	overflow:hidden;
	45	white-space:nowrap;
46	46	}
47	47
48	48	.top_item
49	49	{
50		background-image:url( ../images/top_item_bg.gif );
	50	background-image:url( ../images/top_item_bg.gif );
51	51	}
52	52
53	53	.custom_item
54	54	{
55		background-image:url( ../images/custom_item_bg.gif );
	55	background-image:url( ../images/custom_item_bg.gif );
56	56	}
57	57
58	58	.inactive_item
59	59	{
60		background-image:url( ../images/inact_item_bg.gif );
61		}
62		.system_item
63		{
64		background-image:url( ../images/system_item_bg.gif );
	60	background-image:url( ../images/inact_item_bg.gif );
	61	}
	62	.system_item
	63	{
	64	background-image:url( ../images/system_item_bg.gif );
65	65	}
66	66
…	…
87	87	{
88	88	display: block;
89		color: #6666CC;
90		text-decoration:none;
91		overflow: hidden;
92		}
93
94		.pseudo_wrapper {
95		position: relative;
	89	color: #6666CC;
	90	text-decoration:none;
	91	overflow: hidden;
	92	}
	93
	94	.pseudo_wrapper {
	95	position: relative;
96	96	}
97	97
98	98	.pseudo_head {
99		font-weight:bold;
	99	font-weight:bold;
100	100	}
101	101
…	…
103	103	#pseudo2,
104	104	.legend {
105		border: 1px solid #cccccc
	105	border: 1px solid #cccccc
106	106	}
107	107
108	108	#edit_form_wrapper
109	109	{
110		position:absolute;
111		z-index:15000;
112		background-image:url( ../images/sp_op.png );
	110	position:absolute;
	111	z-index:15000;
	112	background-image:url( ../images/sp_op.png );
113	113	}
114	114
115	115	* html #edit_form_wrapper
116	116	{
117		background-image:url( ../images/spacer.gif );
118		filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op.png', sizingMethod='scale');
	117	background-image:url( ../images/spacer.gif );
	118	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op.png', sizingMethod='scale');
119	119	}
120	120
…	…
125	125	.popup_form_wrapper
126	126	{
127		border-collapse:collapse;
128		margin:0px;
129		padding:0px;
130		width:482px;
	127	border-collapse:collapse;
	128	margin:0px;
	129	padding:0px;
	130	width:482px;
131	131	}
132	132
133	133	.popup_form_wrapper td
134	134	{
135		padding:0px;
136		margin:0px;
	135	padding:0px;
	136	margin:0px;
137	137	}
138	138
139	139	.popup_form_wrapper td.corner
140	140	{
141		width:16px;
142		height:16px;
	141	width:16px;
	142	height:16px;
143	143	}
144	144
145	145	.popup_form_wrapper td.side
146	146	{
147		width:16px;
	147	width:16px;
148	148	}
149	149
150	150	.popup_form_wrapper td.side_ver
151	151	{
152		height:16px;
	152	height:16px;
153	153	}
154	154
…	…
156	156	.popup_form_wrapper td.side
157	157	{
158		background-image:url(../images/sp_op_gr.png);
159		font-size:1px;
	158	background-image:url(../images/sp_op_gr.png);
	159	font-size:1px;
160	160	}
161	161
…	…
163	163	* html .popup_form_wrapper td.side
164	164	{
165		background-image:url( ../images/spacer.gif );
166		filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op_gr.png', sizingMethod='scale');
	165	background-image:url( ../images/spacer.gif );
	166	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/sp_op_gr.png', sizingMethod='scale');
167	167	}
168	168
…	…
170	170	.popup_form_wrapper td.container
171	171	{
172		background-color:white;
173		width:450px;
	172	background-color:white;
	173	width:450px;
174	174	}
175	175
…	…
177	177	{
178	178
179		border:1px solid #666666;
180		padding-top:25px;
181		padding-bottom:25px;
	179	border:1px solid #666666;
	180	padding-top:25px;
	181	padding-bottom:25px;
182	182	}
183	183
184	184	.edit_item_table
185	185	{
186		border-collapse:collapse;
187		margin-left: auto;
188		margin-right: auto;
	186	border-collapse:collapse;
	187	margin-left: auto;
	188	margin-right: auto;
189	189	}
190	190
191	191	.edit_item_table td
192	192	{
193		padding:3px;
	193	padding:3px;
194	194	}
195	195
196	196	.form_label
197	197	{
198		width:125px;
199		font-weight:bold;
200		font-size:13px;
201		text-align:right;
	198	width:125px;
	199	font-weight:bold;
	200	font-size:13px;
	201	text-align:right;
202	202	}
203	203
204	204	.form_input_text
205	205	{
206		width:250px;
	206	width:250px;
207	207	}
208	208
209	209	.form_input_area
210	210	{
211		width:250px;
212		height:125px;
	211	width:250px;
	212	height:125px;
213	213	}
214	214
215	215	.form_colspan
216	216	{
217		text-align:center;
	217	text-align:center;
218	218	}
219	219
220	220	.form_colspan input
221	221	{
222		margin-left:15px;
	222	margin-left:15px;
223	223	}
224	224
…	…
226	226	.loading
227	227	{
228		text-align:center;
229		}
	228	text-align:center;
	229	}

trunk/administration/templates/base/css/modules.css

-                      r15201
+                      r15211
 div.modules-plank {
     margin: 5px  0px;
     padding: 5px;
     position: relative;
     border: 1px solid #cccccc;
+    background-color: #eeeeee;
+    padding: 5px;
+    position: relative;
+    border: 1px solid #cccccc;
+    background-color: #eeeeee;
+}
 span.modules-plank-title {}
 div.modules-plank-switch {
     top: 5px;
     right: 6px;
     width: 13px;
     height: 13px;
+div.modules-plank-switch {
+    top: 5px;
+    right: 6px;
+    width: 13px;
+    height: 13px;
     position: absolute;
+    position: absolute;
     background-image:url(../images/modules_toggle.png);
     background-repeat: no-repeat;
     background-position: 0px 0px;
+    background-image:url(../images/modules_toggle.png);
+    background-repeat: no-repeat;
+    background-position: 0px 0px;
     font-size: 11px;
     font-weight: bold;
     cursor: pointer;
+    font-size: 11px;
+    font-weight: bold;
+    cursor: pointer;
+}
 div.modules-plank-switch-opened {
 …
+}
 div.modules-plank-content {
     display: none;
+    display: none;
+}
 span.modules-plank-success {

trunk/administration/templates/base/css/pageBuilder.css

-                      r15201
+                      r15211
 .block_cont {
     background-color: #ffffff;
     background-image: none;
     width: auto;
+    background-color: #ffffff;
+    background-image: none;
+    width: auto;
     padding: 5px;
     border: 1px solid #cccccc;
+    border: 1px solid #cccccc;
+}
 div.block_head {
 …
 div.block_cont,
 div.block_cont_nd {
     margin-bottom: 10px;
+    margin-bottom: 10px;
     margin-top: 5px;
+}
 .block_cont#activeAreaWrapper {
     margin-bottom: 0px;
     border-bottom: none;
+    margin-bottom: 0px;
+    border-bottom: none;
+}
 .block_cont#activeAreaWrapper .buildArea {
     border-bottom: none;
+    border-bottom: none;
+}
 /*--- Builder styles ---*/
 #buildZoneWrapper {
     width: 782px;
+    width: 782px;
+}
 #buildAreasWrapper {
     margin: 15px;
     position:relative;
+    margin: 15px;
+    position:relative;
+}
 #pageWidthValue,
 #pageWidthValue1 {
     height: 16px;
     position: relative;
     float: left;
     font-size: 12px;
     line-height: 16px;
+    height: 16px;
+    position: relative;
+    float: left;
+    font-size: 12px;
+    line-height: 16px;
+}
 #pageWidthSlider,
 #pageWidthSlider1 {
     float: right;
     position: relative;
     width: 700px;
     height: 16px;
     background-image: url(../images/width_slider.png);
+    float: right;
+    position: relative;
+    width: 700px;
+    height: 16px;
+    background-image: url(../images/width_slider.png);
+}
 …
 #pageWidthSlider1 a.ui-slider-handle {
     top: -2px;
     width: 12px;
     height: 20px;
+    width: 12px;
+    height: 20px;
     border: none;
     background-image: url(../images/slider-handle1.gif);
 …
 .buildArea {
     /*padding: 8px;*/
+    /*padding: 8px;*/
+}
 …
 .buildColumn {
     float:left;
     /*position: relative;*/
+    float:left;
+    /*position: relative;*/
+}
 .buildColumnCont {
     border: 1px solid #ccc;
     background-color: #fff;
     padding: 3px;
     margin: 5px;
     text-align: center;
     overflow: hidden;
+    border: 1px solid #ccc;
+    background-color: #fff;
+    padding: 3px;
+    margin: 5px;
+    text-align: center;
+    overflow: hidden;
+}
 .buildColumnHeader {
     background-color: #ccc;
     padding: 3px;
     font-size: 13px;
     margin-bottom: 5px;
     cursor: move;
     white-space: nowrap;
     overflow: hidden;
     position: relative;
+    background-color: #ccc;
+    padding: 3px;
+    font-size: 13px;
+    margin-bottom: 5px;
+    cursor: move;
+    white-space: nowrap;
+    overflow: hidden;
+    position: relative;
+}
 .buildColumnHeader a {
     cursor: pointer; /*for macs*/
+    cursor: pointer; /*for macs*/
+}
 .buildBlock  {
     margin: 0px auto 2px auto;
     width: 142px;
     height: 22px;
     text-align: center;
     cursor: move;
     padding-top: 6px;
     background-repeat: no-repeat;
     background-image: url( ../images/block_header.gif );
     text-transform: capitalize;
+    font-size: 11px;
+    margin: 0px auto 2px auto;
+    width: 142px;
+    height: 22px;
+    text-align: center;
+    cursor: move;
+    padding-top: 6px;
+    background-repeat: no-repeat;
+    background-image: url( ../images/block_header.gif );
+    text-transform: capitalize;
+    font-size: 11px;
+}
 …
 .buildBlock a {
     cursor: pointer; /*for macs*/
+    cursor: pointer; /*for macs*/
+}
 .buildBlock .blockAlert {
     cursor:help;
     height:16px;
     width:16px;
     vertical-align: middle;
     margin-left: 3px;
+    cursor:help;
+    height:16px;
+    width:16px;
+    vertical-align: middle;
+    margin-left: 3px;
+}
 #samplesBlocksArea .buildBlock,
 #inactiveBlocksArea .buildBlock {
     margin: 2px;
     float: left;
+    margin: 2px;
+    float: left;
+}
 .buildHover {
     /*background-color: #f5f5f5;*/
     border: 1px dashed #999999;
+    /*background-color: #f5f5f5;*/
+    border: 1px dashed #999999;
     float: left;
+}
 .buildBlockFake {
     height: 5px;
     font-size: 1px;
+    height: 5px;
+    font-size: 1px;
+}
 #columnsSlider {
     height: 14px;
     position: relative;
     background-image: url(../images/col_slider_bg.gif);
     border-left: 1px solid #808080;
     border-right: 1px solid #808080;
     border-bottom: 1px solid #808080;
     margin-bottom: 10px;
+    height: 14px;
+    position: relative;
+    background-image: url(../images/col_slider_bg.gif);
+    border-left: 1px solid #808080;
+    border-right: 1px solid #808080;
+    border-bottom: 1px solid #808080;
+    margin-bottom: 10px;
+}
 #columnsSlider a {
     top: -5px;
     width: 12px;
     height: 23px;
+    top: -5px;
+    width: 12px;
+    height: 23px;
     border: none;
     background-image: url(../images/slider-handle.gif);
+    background-image: url(../images/slider-handle.gif);
+}
 #pageControls {
     position: absolute;
     top: -10px;
     right: 0px;
     font-size: 13px;
     font-weight: bold;
+    position: absolute;
+    top: -10px;
+    right: 0px;
+    font-size: 13px;
+    font-weight: bold;
+}
 #pageControls a {
     margin-left: 6px;
+    margin-left: 6px;
+}
 …
 #pageControls a:link,
 #pageControls a:visited {
     text-decoration: none;
+    text-decoration: none;
+}
 #pageControls a:hover,
 #pageControls a:active {
     text-decoration: underline;
+    text-decoration: underline;
+}
 #linkDelete {
     display: block;
     position: absolute;
     right: 3px;
     top: 3px;
     display: block;
     text-decoration: none;
+    display: block;
+    position: absolute;
+    right: 3px;
+    top: 3px;
+    display: block;
+    text-decoration: none;
+}
 …
 #linkDelete:active,
 #linkDelete:hover {
     text-decoration: none;
+    text-decoration: none;
+}
 …
     position: relative;
     float: left;
     line-height: 30px;
+}
 div.adm-pb-cp-item-right {
     margin: 2px 10px 0px 0px;
+    margin: 2px 10px 0px 0px;
     float: right;
     line-height: normal;
+    line-height: normal;
+}
 /*--- Edit Form styles ---*/
 #editFormCont {
     width:482px;
+}
+#editFormCont {
+    width:482px;
+}

trunk/administration/templates/base/css/predefined_values.css

-                      r15201
+                      r15211
 #listEdit {
     border-top:1px solid #999999;
     border-left:1px solid #999999;
+    border-top:1px solid #999999;
+    border-left:1px solid #999999;
+}
 #listEdit tr {
     margin:0px;
     padding:0px;
+    margin:0px;
+    padding:0px;
+}
 #listEdit td,
 #listEdit th {
     padding:2px;
     vertical-align:middle;
     border-right:1px solid #999999;
     border-bottom:1px solid #999999;
+    padding:2px;
+    vertical-align:middle;
+    border-right:1px solid #999999;
+    border-bottom:1px solid #999999;
+}
 #listEdit th {
     padding:2px;
     text-align:center;
     font-weight:bold;
     background-color:#eeeeee;
+    text-align:center;
+    font-weight:bold;
+    background-color:#eeeeee;
+}
 #listEdit tr.even {
     background-color:#ffffff;
+    background-color:#ffffff;
+}
 #listEdit tr.odd {
     background-color:#dddddd;
+    background-color:#dddddd;
+}
 #listEdit td .value_input {
     width:70px;
+    width:70px;
+}
 .tableLabel {
     border-bottom:1px dashed #000000;
     cursor:help;
+    border-bottom:1px dashed #000000;
+    cursor:help;
+}
 img.row_control {
     width:16px;
     height:16px;
     cursor:pointer;
     margin-right: 3px;
+    width:16px;
+    height:16px;
+    cursor:pointer;
+    margin-right: 3px;
+}

trunk/administration/templates/base/css/profiles.css

-                      r15201
+                      r15211
 iframe#adm-mp-members-iframe {
     width: 0px;
     height: 0px;
     margin: 0px;
     padding: 0px;
+    width: 0px;
+    height: 0px;
+    margin: 0px;
+    padding: 0px;
     border: 0px;
+    border: 0px;
+}
 form#adm-mp-members-form {
 …
 /*--- Tags Styles ---*/
 div.tags_wrapper {
+    text-align: center;
+    text-align: center;
+}
 span.one_tag{
     padding: 0px 4px;
     line-height: 30px;
+    line-height: 30px;
+}
 …
     width: 210px;
     height: 30px;
     position: relative;
     float: left;
     background-image: url(../images/icons/pm_qlinks_item.png);
     background-position: 0px 7px;
     background-repeat: no-repeat;
     line-height: 30px;
     text-indent: 20px;
 …
     position: relative;
     float: left;
     line-height: 30px;
+}
 div.adm-mp-order-item-right {
     padding: 0px 10px 0px 0px;
     float: right;
+}
 …
     position: absolute;
     z-index: 2;
     background-color: #ffcccc;
+}
 …
+}
 *+html div.adm-mp-ms-check input.form_input_checkbox {
     margin: 0px;
+    margin: 0px;
+}
 div.adm-mp-ms-username {
 …
     padding: 5px;
     position: relative;
+    position: relative;
+}
 div.adm-mp-ms-thumbnail {

trunk/administration/templates/base/dashboard_content_info.html

-                      r14102
+                      r15211
 <!--
     $(document).ready(function() {
         $.get(
+            '<bx_url_root />get_rss_feed.php?ID=boonex_version&member=0',
             {},
             function(sData) {
                 var sVerCur = '__current_version__';
+                var sVerNew = $(sData).find('dolphin').html();
+        $.get(
+            '<bx_url_root />get_rss_feed.php?ID=boonex_version&member=0',
+            {},
+            function(sData) {
+                var sVerCur = '__current_version__';
+                var sVerNew = $(sData).find('dolphin').html();
                 if(sVerNew != 'undefined' && sVerNew != '' && sVerNew != sVerCur)
                     $('#adm-dic-update').html('<a href="http://www.boonex.com/dolphin/download/"><bx_text:_adm_txt_dashboard_update_to /> ' + sVerNew + '</a>');
             },
             'text'
         );
     });
+                if(sVerNew != 'undefined' && sVerNew != '' && sVerNew != sVerCur)
+                    $('#adm-dic-update').html('<a href="http://www.boonex.com/dolphin/download/"><bx_text:_adm_txt_dashboard_update_to /> ' + sVerNew + '</a>');
+            },
+            'text'
+        );
+    });
 -->
 </script>
 …
     <tr>
         <td class="left">
             __cell_11__
+            __cell_11__
         </td>
         <td class="right">
             <span class="__cell_12_class__">__cell_12__</span>
         </td>
+            <span class="__cell_12_class__">__cell_12__</span>
+        </td>
     </tr>
     <tr>

trunk/administration/templates/base/default.html

r15201	r15211
1		<bx_include_auto:_sub_header.html />
	1	<bx_include_auto:_sub_header.html />
2	2	__page_main_code__
3	3	__promo_code__

trunk/administration/templates/base/design_box_1.html

-                      r15201
+                      r15211
 <!-- Design Box [ Start ] here  -->
 <div class="bx-db-container bx-def-border bx-def-color-bg-block bx-def-margin-bottom">
     <div class="bx-db-header bx-def-border-bottom">
+    <div class="bx-db-header bx-def-border-bottom">
         <div class="bx-db-title bx-def-padding-sec-left">__title__</div>
         <div class="bx-db-menu">
 …
             </bx_repeat:actions>
         </div>
     </div>
     <div class="bx-db-content">__content__</div>
     __bottom_items__
+    </div>
+    <div class="bx-db-content">__content__</div>
+    __bottom_items__
 </div>
 <!-- Design Box [ End ] here  -->

trunk/administration/templates/base/fields.html

-                      r15201
+                      r15211
 <div id="edit_form_cont"></div>
 <div id="main_container">
     <div id="tabs_container">
         <div id="m1">
             <div class="build_container"><bx_text:_adm_fields_loading /></div>
         </div>
         <div id="edit-tab" style="display:none">
+    <div id="tabs_container">
+        <div id="m1">
+            <div class="build_container"><bx_text:_adm_fields_loading /></div>
+        </div>
+        <div id="edit-tab" style="display:none">
             <div class="adm-db-control-panel" id="mode_switcher_1">
                 <ul>
                     <li><a href="#m2"><bx_text:_adm_fields_owner /></a></li>
                     <li><a href="#m3"><bx_text:_adm_fields_admin /></a></li>
                 </ul>
+                <ul>
+                    <li><a href="#m2"><bx_text:_adm_fields_owner /></a></li>
+                    <li><a href="#m3"><bx_text:_adm_fields_admin /></a></li>
+                </ul>
             </div>
             <div id="m2">
                 <div class="build_container"></div>
             </div>
             <div id="m3">
                 <div class="build_container"></div>
             </div>
         </div>
         <div id="view-tab" style="display:none">
+            <div id="m2">
+                <div class="build_container"></div>
+            </div>
+            <div id="m3">
+                <div class="build_container"></div>
+            </div>
+        </div>
+        <div id="view-tab" style="display:none">
             <div class="adm-db-control-panel" id="mode_switcher_2">
                 <ul>
                     <li><a href="#m5"><bx_text:_adm_fields_admin /></a></li>
                     <li><a href="#m6"><bx_text:_adm_fields_member /></a></li>
                     <li><a href="#m8"><bx_text:_adm_fields_visitor /></a></li>
                 </ul>
+                <ul>
+                    <li><a href="#m5"><bx_text:_adm_fields_admin /></a></li>
+                    <li><a href="#m6"><bx_text:_adm_fields_member /></a></li>
+                    <li><a href="#m8"><bx_text:_adm_fields_visitor /></a></li>
+                </ul>
             </div>
             <div id="m5">
                 <div class="build_container"></div>
             </div>
             <div id="m6">
                 <div class="build_container"></div>
+            </div>
             <div id="m8">
                 <div class="build_container"></div>
             </div>
         </div>
         <div id="search-tab" style="display:none">
+            <div id="m5">
+                <div class="build_container"></div>
+            </div>
+            <div id="m6">
+                <div class="build_container"></div>
+            </div>
+            <div id="m8">
+                <div class="build_container"></div>
+            </div>
+        </div>
+        <div id="search-tab" style="display:none">
             <div class="adm-db-control-panel" id="mode_switcher_3">
                 <ul>
                     <li><a href="#m9"><bx_text:_adm_fields_simple_search /></a></li>
                     <li><a href="#m10"><bx_text:_adm_fields_quick_search /></a></li>
                     <li><a href="#m11"><bx_text:_adm_fields_advanced_search /></a></li>
                 </ul>
+                <ul>
+                    <li><a href="#m9"><bx_text:_adm_fields_simple_search /></a></li>
+                    <li><a href="#m10"><bx_text:_adm_fields_quick_search /></a></li>
+                    <li><a href="#m11"><bx_text:_adm_fields_advanced_search /></a></li>
+                </ul>
             </div>
             <div id="m9">
                 <div class="build_container"></div>
             </div>
             <div id="m10">
                 <div class="build_container"></div>
             </div>
             <div id="m11">
                 <div class="build_container"></div>
             </div>
+        </div>
     </div>
+            <div id="m9">
+                <div class="build_container"></div>
+            </div>
+            <div id="m10">
+                <div class="build_container"></div>
+            </div>
+            <div id="m11">
+                <div class="build_container"></div>
+            </div>
+        </div>
+    </div>
 </div>
 <script language="javascript" type="text/javascript">
 <!--
     oPFM = new BxDolPFM();
     oPFM.config.areas  = 11;
     oPFM.config.parserUrl = 'fields.parse.php';
+    oPFM = new BxDolPFM();
+    oPFM.config.areas  = 11;
+    oPFM.config.parserUrl = 'fields.parse.php';
+    $(document).ready(function() {
+        $('#mode_switcher_1').tabs();
+        $('#mode_switcher_2').tabs();
+        $('#mode_switcher_3').tabs();
+        oPFM.init();
+    });
+    function changeType(oLink){
+        var sType = oLink.id.replace('adm-fb-ctl-', '');
+    $(document).ready(function() {
+        $('#mode_switcher_1').tabs();
+        $('#mode_switcher_2').tabs();
+        $('#mode_switcher_3').tabs();
+        oPFM.init();
+    });
+        $(oLink).parent('.notActive').hide().siblings('.notActive:hidden').show().siblings('.active').hide().siblings('#' + $(oLink).attr('id') + '-act').show();
+    function changeType(oLink){
+        var sType = oLink.id.replace('adm-fb-ctl-', '');
+        $('#tabs_container > :visible').bx_anim('hide', 'fade', 'slow', function() {
+        $(oLink).parent('.notActive').hide().siblings('.notActive:hidden').show().siblings('.active').hide().siblings('#' + $(oLink).attr('id') + '-act').show();
+        $('#tabs_container > :visible').bx_anim('hide', 'fade', 'slow', function() {
             $('#tabs_container > #' + sType).show();
+        });
+    }
+        });
+    }
 -->
 </script>

trunk/administration/templates/base/hosting_promo.html

-                      r15201
+                      r15211
 <style>
     .adm-hosting-promo {
         position:relative;
+    }
     .adm-hosting-promo > img {
         position:absolute;
         top:0px;
         left:0px;
         width:60px;
         height:60px;
         background-repeat:no-repeat;
         background-position:center center;
+    }
     .adm-hosting-promo > div {
         padding:10px 10px 10px 60px;
+    }
     .adm-hosting-promo > div > a {
         display:block;
         font-size:14px;
         font-weight:bold;
+    }
+    .adm-hosting-promo {
+        position:relative;
+    }
+    .adm-hosting-promo > img {
+        position:absolute;
+        top:0px;
+        left:0px;
+        width:60px;
+        height:60px;
+        background-repeat:no-repeat;
+        background-position:center center;
+    }
+    .adm-hosting-promo > div {
+        padding:10px 10px 10px 60px;
+    }
+    .adm-hosting-promo > div > a {
+        display:block;
+        font-size:14px;
+        font-weight:bold;
+    }
 </style>
 <div class="adm-hosting-promo">
     <img src="<bx_image_url:spacer.gif />" style="background-image:url(<bx_icon_url:hosting_promo.png />);" />
     <div>
         <a target="_blank" href="http://www.boonex.com/hosting/"><bx_text:_adm_txt_hosting_title /></a>
         <bx_text:_adm_txt_hosting_text />
     </div>
+    <img src="<bx_image_url:spacer.gif />" style="background-image:url(<bx_icon_url:hosting_promo.png />);" />
+    <div>
+        <a target="_blank" href="http://www.boonex.com/hosting/"><bx_text:_adm_txt_hosting_title /></a>
+        <bx_text:_adm_txt_hosting_text />
+    </div>
 </div>

trunk/administration/templates/base/langs_form_create.html

r15201	r15211
2	2
3	3	<div id="adm-langs-cnt-create" style="display:__display__;">
4		<div class="adm-db-content-wrapper">__form__</div>
	4	<div class="adm-db-content-wrapper">__form__</div>
5	5	</div>

trunk/administration/templates/base/langs_form_import.html

r15201	r15211
2	2
3	3	<div id="adm-langs-cnt-import" style="display:__display__;">
4		<div class="adm-db-content-wrapper">__form__</div>
	4	<div class="adm-db-content-wrapper">__form__</div>
5	5	</div>

trunk/administration/templates/base/langs_key.html

-                      r15201
+                      r15211
 <div id="adm-langs-__type__-key" style="display:none;">
     <table class="popup_form_wrapper">
         <tr>
             <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
             <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
         </tr>
         <tr>
             <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="container">
                 <div class="adm-design-box">
                     <div class="adm-db-head">
+        <tr>
+            <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
+            <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
+        </tr>
+        <tr>
+            <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="container">
+                <div class="adm-design-box">
+                    <div class="adm-db-head">
                         <bx_text:_adm_box_cpt_lang_key />
                         <div class="dbTopMenu">
 …
                             </div>
                         </div>
                     </div>
                     <div class="adm-db-content">
+                    </div>
+                    <div class="adm-db-content">
                         <div class="adm-db-content-wrapper">
                             <div id="adm-langs-__type__-key-content">
 …
                             </div>
                         </div>
                     </div>
                 </div>
+                    </div>
+                </div>
             </td>
             <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
         </tr>
         <tr>
             <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
             <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
         </tr>
     </table>
+            <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+        </tr>
+        <tr>
+            <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
+            <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
+        </tr>
+    </table>
 </div>

trunk/administration/templates/base/login.html

-                      r10490
+                      r15211
 <div class="admin_login_wrapper">
     <img class="admin_login_icon" src="<bx_image_url:admin_login_icon.png />" />
     <div class="admin_login_form_wrapper">
         <form class="admin_login_form" action="__action_url__" method="post" onsubmit="javascript: validateLoginForm(this); return false;">
             <input type="hidden" name="relocate" value="__relocate_url__" />
+    <img class="admin_login_icon" src="<bx_image_url:admin_login_icon.png />" />
+    <div class="admin_login_form_wrapper">
+        <form class="admin_login_form" action="__action_url__" method="post" onsubmit="javascript: validateLoginForm(this); return false;">
+            <input type="hidden" name="relocate" value="__relocate_url__" />
             <table cellspacing="20" cellpadding="0" class="admin_login_table">
                 <tr>
 …
 <div class="admin_login_footers">
     <div class="left_banner">
         <img src="<bx_image_url:admin_login_admin_logo.png />" alt="Dolphin 7 Admin" />
+    <div class="left_banner">
+        <img src="<bx_image_url:admin_login_admin_logo.png />" alt="Dolphin 7 Admin" />
     </div>
     <div class="right_banner">
         <img src="../media/images/small_logo.png" alt="BoonEx - Community Software Experts" />
+        <img src="../media/images/small_logo.png" alt="BoonEx - Community Software Experts" />
     </div>
 </div>

trunk/administration/templates/base/main_menu.html

r15201	r15211
12	12	<bx_if:item-link>
13	13	<a href="__link__">__title__</a>
14		</bx_if:item-link>
	14	</bx_if:item-link>
15	15	</div>
16	16	<bx_if:submenu>

trunk/administration/templates/base/manage_subscribers.html

-                      r15201
+                      r15211
 <form id="adm-ms-form" name="adm-ms-form" action="" method="post">
     <div class="adm-ms-items">
+    <div class="adm-ms-items">
         <bx_repeat:items>
             <div class="adm-ms-item">
 …
                 <div class="adm-ms-name">__name__</div>
                 <div class="adm-ms-email">__email__</div>
                 <div class="clear_both">&nbsp;</div>
+                <div class="clear_both">&nbsp;</div>
             </div>
         </bx_repeat:items>
     </div>
     __paginate__

trunk/administration/templates/base/menu_compose.html

-                      r15201
+                      r15211
 <div class="adm-db-content-wrapper">
     __extra_js__
     <div id="edit_form_cont"></div>
     <div id="menu_app_wrapper"></div>
     <div class="pseudo_wrapper">
         <div class="pseudo_head"><bx_text:_adm_mbuilder_active_items /></div>
         <div id="pseudo1">
             <img src="<bx_image_url:loading.gif />" />
         </div>
         <div class="pseudo_head" style="padding-top:7px;"><bx_text:_adm_mbuilder_all_items /></div>
         <div id="pseudo2">
             <img src="<bx_image_url:loading.gif />" />
         </div>
     </div>
     <div class="pseudo_head" style="padding-top:7px;"><bx_text:_adm_mbuilder_legend /></div>
     <div class="legend">
         <table border="0">
             <tr><td><img src="<bx_image_url:system_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_system /></td></tr>
             <tr><td><img src="<bx_image_url:top_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_top /></td></tr>
             <tr><td><img src="<bx_image_url:custom_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_custom /></td></tr>
             <tr><td><img src="<bx_image_url:inact_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_inact /></td></tr>
         </table>
     </div>
+    <div id="edit_form_cont"></div>
+    <div id="menu_app_wrapper"></div>
+    <div class="pseudo_wrapper">
+        <div class="pseudo_head"><bx_text:_adm_mbuilder_active_items /></div>
+        <div id="pseudo1">
+            <img src="<bx_image_url:loading.gif />" />
+        </div>
+        <div class="pseudo_head" style="padding-top:7px;"><bx_text:_adm_mbuilder_all_items /></div>
+        <div id="pseudo2">
+            <img src="<bx_image_url:loading.gif />" />
+        </div>
+    </div>
+    <div class="pseudo_head" style="padding-top:7px;"><bx_text:_adm_mbuilder_legend /></div>
+    <div class="legend">
+        <table border="0">
+            <tr><td><img src="<bx_image_url:system_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_system /></td></tr>
+            <tr><td><img src="<bx_image_url:top_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_top /></td></tr>
+            <tr><td><img src="<bx_image_url:custom_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_custom /></td></tr>
+            <tr><td><img src="<bx_image_url:inact_item_bg.gif />" /></td><td><bx_text:_adm_mbuilder_legend_inact /></td></tr>
+        </table>
+    </div>
 </div>

trunk/administration/templates/base/mlevels_action.html

-                      r15201
+                      r15211
 <div id="adm-mlevels-action" style="display:none;">
     <table class="popup_form_wrapper">
         <tr>
             <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
             <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
         </tr>
         <tr>
             <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="container">
                 <div class="adm-design-box">
                     <div class="adm-db-head">
+        <tr>
+            <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
+            <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
+        </tr>
+        <tr>
+            <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="container">
+                <div class="adm-design-box">
+                    <div class="adm-db-head">
                         <bx_text:_adm_box_cpt_mlevel_action />
                         <div class="dbTopMenu">
 …
                             </div>
                         </div>
                     </div>
                     <div class="adm-db-content">
+                    </div>
+                    <div class="adm-db-content">
                         <div class="adm-db-content-wrapper">
                             <div id="adm-mlevels-action-content">
 …
                             </div>
                         </div>
                     </div>
                 </div>
+                    </div>
+                </div>
             </td>
             <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
         </tr>
         <tr>
             <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
             <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
             <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
         </tr>
     </table>
+            <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+        </tr>
+        <tr>
+            <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
+            <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+            <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
+        </tr>
+    </table>
 </div>

trunk/administration/templates/base/mlevels_actions.html

r15201	r15211
7	7	<bx_repeat:items>
8	8	<div class="adm-mlevels-item __class__">
9		<input type="checkbox" class="form_input_checkbox" id="adm-mlevels-__action_id__" name="actions[]" value="__action_id__" />
	9	<input type="checkbox" class="form_input_checkbox" id="adm-mlevels-__action_id__" name="actions[]" value="__action_id__" />
10	10	<bx_if:enabled>
11	11	<a href="javascript:void(0)" onclick="javascript:onEditAction(__level_id__, __action_id__)">__title__</a>

trunk/administration/templates/base/mlevels_list.html

r15201	r15211
4	4	<div class="adm-mlevels-items">
5	5	<bx_repeat:items>
6		<div class="adm-mlevels-item __class__">
	6	<div class="adm-mlevels-item __class__">
7	7	<input type="checkbox" class="form_input_checkbox" id="adm-mlevels-__id__" name="levels[]" value="__id__" <bx_if:system>disabled="disabled"</bx_if:system> />
8	8	<bx_if:enabled>

trunk/administration/templates/base/modules_results.html

r15201	r15211
10	10	<bx_if:operation_result_failed>
11	11	<span class="modules-plank-failed"><bx_text:_adm_txt_modules_process_failed /></span>
12		</bx_if:operation_result_failed>
	12	</bx_if:operation_result_failed>
13	13	<div class="modules-plank-switch" onclick="$(this).toggleClass('modules-plank-switch-opened').next().toggle()"></div>
14	14	<div class="modules-plank-content">__message__</div>

trunk/administration/templates/base/mp_controls.html

r15201	r15211
3	3	<div id="adm-mp-control" class="adm-db-content-wrapper">
4	4	<bx_include_auto:mp_ctl_type_qlinks.html />
5		<bx_include_auto:mp_ctl_type_browse.html />
	5	<bx_include_auto:mp_ctl_type_browse.html />
6	6	<bx_include_auto:mp_ctl_type_calendar.html />
7	7	<bx_include_auto:mp_ctl_type_tags.html />

trunk/administration/templates/base/mp_members.html

-                      r15201
+                      r15211
 <form id="adm-mp-members-form" enctype="multipart/form-data" method="post" action="__action_url__" class="form_advanced" target="adm-mp-members-iframe">
     <input type="hidden" name="adm-mp-members-ctl-type" value="__ctl_type__" />
     <input type="hidden" name="adm-mp-members-view-type" value="__view_type__" />
+    <input type="hidden" name="adm-mp-members-view-type" value="__view_type__" />
     <div class="adm-db-control-panel">
         <div class="adm-mp-order-item">
 …
                 <option value="DateReg DESC"><bx_text:_adm_txt_mp_order_last_join /></option>
                 <option value="DateLastNav DESC"><bx_text:_adm_txt_mp_order_last_activity /></option>
             </select>
+            </select>
         </div>
         <div class="adm-mp-order-item-right">
 …
         <div class="clear_both">&nbsp;</div>
     </div>
     <div class="adm-mp-members-wrapper" id="adm-mp-members-simple" style="__style_simple__">__content_simple__</div>
     <div class="adm-mp-members-wrapper" id="adm-mp-members-extended" style="__style_extended__">__content_extended__</div>

trunk/administration/templates/base/mp_members_extended.html

-                      r15201
+                      r15211
 <div class="adm-mp-members-extended">
     <bx_repeat:items>
         <div class="adm-mp-member-extended">
+        <div class="adm-mp-member-extended">
             <div class="adm-mp-ms-check">
                 <input type="checkbox" class="form_input_checkbox" id="adm-mp-__id__" name="members[]" value="__id__" />
 …
             <div class="adm-mp-ms-thumbnail">__thumbnail__</div>
             <div class="adm-mp-ms-info">
                 <div class="adm-mp-ms-nick">
+                <div class="adm-mp-ms-nick">
                     <a href="__edit_link__" class="__edit_class__">__username__</a>:
                     __headline__
                 </div>
                 <div class="adm-mp-ms-age">
                     <img src="__sex_link__" />
                     __age__
                     <bx_if:flag>
+                <div class="adm-mp-ms-age">
+                    <img src="__sex_link__" />
+                    __age__
+                    <bx_if:flag>
                         <img src="__flag_link__" alt="flag" />
                     </bx_if:flag>
                      __city__,
                      __country__
                 </div>
                 <div class="adm-mp-ms-desc">__description__</div>
             </div>
             <div class="clear_both">&nbsp;</div>
+                    </bx_if:flag>
+                     __city__,
+                     __country__
+                </div>
+                <div class="adm-mp-ms-desc">__description__</div>
+            </div>
+            <div class="clear_both">&nbsp;</div>
         </div>
     </bx_repeat:items>
+    </bx_repeat:items>
 </div>
 __paginate__

trunk/administration/templates/base/mp_members_geeky.html

-                      r15201
+                      r15211
             <th><bx_text:_adm_txt_mp_mlevel /></th>
             <th><bx_text:_adm_txt_mp_registration /></th>
             <th><bx_text:_adm_txt_mp_last_login /></th>
+            <th><bx_text:_adm_txt_mp_last_login /></th>
         </tr>
         <bx_repeat:items>
 …
                 <td width="100px">__ml_name__</td>
                 <td width="105px">__registration__</td>
                 <td width="105px">__last_login__</td>
+                <td width="105px">__last_login__</td>
             </tr>
         </bx_repeat:items>

trunk/administration/templates/base/notifies_filter.html

-                      r15201
+                      r15211
 <script type="text/javascript" language="JavaScript">
     <!--
     function setControlsState() {
         var state_disabled = ($('.form_queue_form select[name=age_start]').attr('disabled') == true) ? '' : 'disabled';
+    <!--
+    function setControlsState() {
+        var state_disabled = ($('.form_queue_form select[name=age_start]').attr('disabled') == true) ? '' : 'disabled';
         $(".form_queue_form input[name='sex[]']").attr('disabled', state_disabled);
         $('.form_queue_form select[name=age_start]').attr('disabled', state_disabled);
         $('.form_queue_form select[name=age_end]').attr('disabled', state_disabled);
         $('.form_queue_form select[name=country]').attr('disabled', state_disabled);
         $('.form_queue_form select[name=membership]').attr('disabled', state_disabled);
+    }
     -->
+        $(".form_queue_form input[name='sex[]']").attr('disabled', state_disabled);
+        $('.form_queue_form select[name=age_start]').attr('disabled', state_disabled);
+        $('.form_queue_form select[name=age_end]').attr('disabled', state_disabled);
+        $('.form_queue_form select[name=country]').attr('disabled', state_disabled);
+        $('.form_queue_form select[name=membership]').attr('disabled', state_disabled);
+    }
+    -->
 </script>
 <center></center>

trunk/administration/templates/base/page_10.html

r15201	r15211
1	1	<!-- TODO: remake to regular template file + some standard page index -->
2		<bx_include_auto:_sub_header.html />
	2	<bx_include_auto:_sub_header.html />
3	3	__page_code_controls__
4	4	__page_code_members__

trunk/administration/templates/base/page_13.html

-                      r15201
+                      r15211
     __page_code_new_message__
     __page_code_preview_message__
     __page_code_all_messages__
     __page_code_queue_message__
+    __page_code_all_messages__
+    __page_code_queue_message__
 <bx_include_auto:_sub_footer.html />

trunk/administration/templates/base/page_3.html

-                      r15201
+                      r15211
     <!-- Design Box [ Start ] here  -->
     <div class="adm-design-box">
         <div class="adm-db-head">__page_header_text__</div>
         <div class="adm-db-content">
+        <div class="adm-db-head">__page_header_text__</div>
+        <div class="adm-db-content">
             <div class="adm-settings-wrapper">
                 __page_result_code__
 …
     </div>
     <!-- Design Box [ End ] here  -->
     __promo_code__
+    __promo_code__
 <bx_include_auto:_sub_footer.html />

trunk/administration/templates/base/page_4.html

r15201	r15211
2	2	<bx_include_auto:_sub_header.html />
3	3	<!-- Design Box [ Start ] here -->
4		__page_code_settings__
	4	__page_code_settings__
5	5	__page_code_logo__
6	6	__page_code_promo__

trunk/administration/templates/base/page_6.html

r15201	r15211
1	1	<!-- TODO: remake to regular template file + some standard page index -->
2		<bx_include_auto:_sub_header.html />
	2	<bx_include_auto:_sub_header.html />
3	3	__page_code_settings__
4	4	__page_code_create__

trunk/administration/templates/base/page_7.html

-                      r15201
+                      r15211
 <!-- TODO: remake to regular template file + some standard page index -->
 <bx_include_auto:_sub_header.html />
+<bx_include_auto:_sub_header.html />
     __page_code_results__
     __page_code_uploader__
 …
     __page_code_not_installed__
     __page_code_updates__
     __page_code_market_feed__
+    __page_code_market_feed__
 <bx_include_auto:_sub_footer.html />

trunk/administration/templates/base/page_8.html

r15201	r15211
1	1	<!-- TODO: remake to regular template file + some standard page index -->
2		<bx_include_auto:_sub_header.html />
	2	<bx_include_auto:_sub_header.html />
3	3	__page_code_settings__
4	4	__page_code_templates__

trunk/administration/templates/base/pbuilder_content.html

-                      r15201
+                      r15211
 <div id="buildZoneWrapper">
     __selector__
     <bx_if:page>
         <div id="buildAreasWrapper">
             <div class="block_head"><bx_text:_adm_txt_pb_page_width /></div>
             <div class="block_cont_nd">
                 <div id="pageWidthValue"></div>
                 <div id="pageWidthSlider"></div>
                 <div class="clear_both"></div>
             </div>
             <div class="block_head"><bx_text:_adm_txt_pb_active_blocks /></div>
             <div class="block_cont" id="activeAreaWrapper">
                 <div id="pageControls">
+    __selector__
+    <bx_if:page>
+        <div id="buildAreasWrapper">
+            <div class="block_head"><bx_text:_adm_txt_pb_page_width /></div>
+            <div class="block_cont_nd">
+                <div id="pageWidthValue"></div>
+                <div id="pageWidthSlider"></div>
+                <div class="clear_both"></div>
+            </div>
+            <div class="block_head"><bx_text:_adm_txt_pb_active_blocks /></div>
+            <div class="block_cont" id="activeAreaWrapper">
+                <div id="pageControls">
                     <bx_if:delete_link>
                         <a href="javascript:void(0)" onclick="oPB.deleteCustomPage()"><bx_text:_Delete /></a>
 …
                         <a href="__site_url__page/__page_name__" target="_blank"><bx_text:_adm_txt_pb_view_page /></a>
                     </bx_if:view_link>
                 </div>
                 <div id="activeBlocksArea" class="buildArea">
                     <bx_text:_adm_txt_pb_loading />
                 </div>
             </div>
             <div id="columnsSlider"></div>
             <div class="block_head"><bx_text:_adm_txt_pb_inactive_blocks /></div>
             <div class="block_cont">
                 <div id="inactiveBlocksArea" class="buildArea">
                     <bx_text:_adm_txt_pb_loading />
                 </div>
             </div>
             <div class="block_head"><bx_text:_adm_txt_pb_samples /></div>
             <div class="block_cont">
                 <div id="samplesBlocksArea" class="buildArea">
                     <bx_text:_adm_txt_pb_loading />
                 </div>
             </div>
             <div class="block_head"><bx_text:_adm_txt_pb_other_pages_width /></div>
             <div class="block_cont_nd">
                 <div id="pageWidthValue1"></div>
                 <div id="pageWidthSlider1"></div>
                 <div class="clear_both"></div>
             </div>
         </div>
         <script language="javascript" type="text/javascript">
         <!--
+                </div>
+                <div id="activeBlocksArea" class="buildArea">
+                    <bx_text:_adm_txt_pb_loading />
+                </div>
+            </div>
+            <div id="columnsSlider"></div>
+            <div class="block_head"><bx_text:_adm_txt_pb_inactive_blocks /></div>
+            <div class="block_cont">
+                <div id="inactiveBlocksArea" class="buildArea">
+                    <bx_text:_adm_txt_pb_loading />
+                </div>
+            </div>
+            <div class="block_head"><bx_text:_adm_txt_pb_samples /></div>
+            <div class="block_cont">
+                <div id="samplesBlocksArea" class="buildArea">
+                    <bx_text:_adm_txt_pb_loading />
+                </div>
+            </div>
+            <div class="block_head"><bx_text:_adm_txt_pb_other_pages_width /></div>
+            <div class="block_cont_nd">
+                <div id="pageWidthValue1"></div>
+                <div id="pageWidthSlider1"></div>
+                <div class="clear_both"></div>
+            </div>
+        </div>
+        <script language="javascript" type="text/javascript">
+        <!--
             $(document).ready(function(){
                 oPB = new BxDolPageBuilder({
 …
             });
         -->
         </script>
+        </script>
     </bx_if:page>
 </div>

trunk/administration/templates/base/popup_form_wrapper.html

-                      r15201
+                      r15211
 <table class="popup_form_wrapper">
     <tr>
         <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
         <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
         <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
     </tr>
     <tr>
         <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
         <td class="container">
                 <div class="adm-design-box">
                     <div class="adm-db-head">
                         __caption__
+    <tr>
+        <td class="corner"><img src="<bx_image_url:op_cor_tl.png />" alt="" /></td>
+        <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+        <td class="corner"><img src="<bx_image_url:op_cor_tr.png />" alt="" /></td>
+    </tr>
+    <tr>
+        <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+        <td class="container">
+                <div class="adm-design-box">
+                    <div class="adm-db-head">
+                        __caption__
                         <div class="dbTopMenu">
                             <div class="adm-db-close" style="background-image:url(<bx_image_url:close.gif />)">
 …
                             </div>
                         </div>
                     </div>
                     <div class="adm-db-content">
+                    </div>
+                    <div class="adm-db-content">
                         <div class="adm-db-content-wrapper">
                             <div id="adm-mlevels-action-content">
 …
                             </div>
                         </div>
                     </div>
                 </div>
+                    </div>
+                </div>
         </td>
         <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
     </tr>
     <tr>
         <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
         <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
         <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
     </tr>
+        </td>
+        <td class="side"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+    </tr>
+    <tr>
+        <td class="corner"><img src="<bx_image_url:op_cor_bl.png />" alt="" /></td>
+        <td class="side_ver"><img src="<bx_image_url:spacer.gif />" alt="" /></td>
+        <td class="corner"><img src="<bx_image_url:op_cor_br.png />" onload="if( navigator.appName == 'Microsoft Internet Explorer' && window.version && version >= 5.5 && version < 7 ) png_fix();" alt="" /></td>
+    </tr>
 </table>

trunk/administration/templates/base/promo.html

-                      r15201
+                      r15211
         function togglePromo(oRadio) {
             var aSwitcher = {text: 'image', image: 'text'};
             $('#promo-cnt-' + aSwitcher[$(oRadio).val()]).bx_anim('hide', 'fade', 'slow', function(){
                 $('#promo-cnt-' + $(oRadio).val()).bx_anim('show', 'fade', 'slow');
             });
+        }
+        }
     -->
     </script>

trunk/administration/templates/base/promo_images.html

r15201	r15211
2	2
3	3	<bx_repeat:images>
4		<a href="javascript:void(0);" onmouseover="javascript:onOver('__title__');" onmousemove="javascript:moveFloatDesc(event);" onmouseout="javascript:hideFloatDesc();">__title__</a> (<a href="__delete_url__"><bx_text:_adm_txt_settings_delete /></a>)<br />
	4	<a href="javascript:void(0);" onmouseover="javascript:onOver('__title__');" onmousemove="javascript:moveFloatDesc(event);" onmouseout="javascript:hideFloatDesc();">__title__</a> (<a href="__delete_url__"><bx_text:_adm_txt_settings_delete /></a>)<br />
5	5	</bx_repeat:images>
6	6	<script type="text/javascript" language="javascript">

trunk/administration/templates/base/register.html

-                      r15201
+                      r15211
 <div class="admin_login_wrapper">
     <div class="admin_license_form_wrapper">
         <form class="admin_login_form" method="post">
             <input type="hidden" name="ID" value="__id__" />
             <input type="hidden" name="Password" value="__password__" />
+    <div class="admin_license_form_wrapper">
+        <form class="admin_login_form" method="post">
+            <input type="hidden" name="ID" value="__id__" />
+            <input type="hidden" name="Password" value="__password__" />
             <table cellspacing="20" cellpadding="0" class="admin_login_table">
                 <tr>
 …
                 </tr>
                 <tr>
                     <td>
+                    <td>
                     </td>
                     <td>
                         <input type="submit" id="admin_login_form_submit" value="Register"/>
+                        <input type="submit" id="admin_login_form_submit" value="Register"/>
                     </td>
                 </tr>
                 <tr>
                     <td colspan="2" style="font-size:14px; padding-top:35px;">
 If money is tight, or you don't feel like supporting BoonEx, or just want to test-drive Dolphin you can
 <a href="http://www.boonex.com/community/licenses/">generate a free license at BoonEx Unity</a> or <a href="__relocate_url__">continue using an unregistered copy</a>. In that case, links
+                <tr>
+                    <td colspan="2" style="font-size:14px; padding-top:35px;">
+If money is tight, or you don't feel like supporting BoonEx, or just want to test-drive Dolphin you can
+<a href="http://www.boonex.com/community/licenses/">generate a free license at BoonEx Unity</a> or <a href="__relocate_url__">continue using an unregistered copy</a>. In that case, links
 to BoonEx ads and promo blocks will remain on your site and admin panel.
                     </td>
                 </tr>
+                    </td>
+                </tr>
             </table>
         </form>

Context Navigation

Legend:

Download in other formats: