Merge branch 'master' of github.com:boonex/dolphin

inc/classes/BxDolDb.php

@@ -523,8 +523,8 @@ EOJ;
             ?>
                 <div style="border:2px solid red;padding:4px;width:600px;margin:0px auto;">
                     <div style="text-align:center;background-color:red;color:white;font-weight:bold;">Error</div>
-                    <div style="text-align:center;"><?=$out?></div>
-            <?
+                    <div style="text-align:center;"><?php echo $out?></div>
+            <?php
             if(BxDolConfig::getInstance()->get('db', 'debug_mode')) {
                 if( strlen( $query ) )
                     echo "<div><b>Query:</b><br />{$query}</div>";
@@ -555,7 +555,7 @@ EOJ;
             }
             ?>
                 </div>
-            <?
+            <?php
         }
         else
             echo $out;

inc/classes/BxDolTemplate.php

@@ -1656,7 +1656,7 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton {
             }
             else {
                 $sKey = "'" . $aKeyWrappers['left'] . $aKeys[$i] . $aKeyWrappers['right'] . "'s";
-                $sValue = "<?=" . $aVarName . "['" . $aKeys[$i] . "'];?>";
+                $sValue = "<?php echo " . $aVarName . "['" . $aKeys[$i] . "'];?>";
             }
 
             $aKeys[$i] = $sKey;
@@ -1673,27 +1673,29 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton {
             "'<bx_text:([_\{\}\w\d\s]+[^\s]{1}) \/>'se",
             "'<bx_text_js:([^\s]+) \/>'se",
             "'<bx_text_attribute:([^\s]+) \/>'se",
+        	"'<bx_menu:([^\s]+) \/>'se",
             "'<bx_url_root />'",
-            "'<bx_url_admin />'"
+        	"'<bx_url_studio />'"
         ));
         $aValues = array_merge($aValues, array(
             "\$this->getCached('\\1', \$aVarValues, \$mixedKeyWrapperHtml, BX_DOL_TEMPLATE_CHECK_IN_BOTH, false)",
             "\$this->getCached('\\1', \$aVarValues, \$mixedKeyWrapperHtml, BX_DOL_TEMPLATE_CHECK_IN_BASE, false)",
             "\$this->getCached('\\1', \$aVarValues, \$mixedKeyWrapperHtml, BX_DOL_TEMPLATE_CHECK_IN_TMPL, false)",
-            "<?=\$this->processInjection(\$this->aPage['name_index'], '\\1'); ?>",
+            "<?php echo \$this->processInjection(\$this->aPage['name_index'], '\\1'); ?>",
             "\$this->getImageUrl('\\1')",
             "\$this->getIconUrl('\\1')",
             "_t('\\1')",
             "bx_js_string(_t('\\1'))",
             "bx_html_attribute(_t('\\1'))",
+        	"\$this->getMenu('\\1')",
             BX_DOL_URL_ROOT,
-            BX_DOL_URL_ADMIN
+            BX_DOL_URL_STUDIO
         ));
 
         //--- Parse Predefined Keys ---//
         $sContent = preg_replace($aKeys, $aValues, $sContent);
         //--- Parse System Keys ---//
-        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'", "<?=\$this->parseSystemKey('\\1', \$mixedKeyWrapperHtml);?>", $sContent);
+        $sContent = preg_replace( "'" . $aKeyWrappers['left'] . "([a-zA-Z0-9_-]+)" . $aKeyWrappers['right'] . "'", "<?php echo \$this->parseSystemKey('\\1', \$mixedKeyWrapperHtml);?>", $sContent);
 
         return $sContent;
     }

modules/boonex/contact/classes/BxContactDb.php

@@ -13,7 +13,7 @@ bx_import('BxDolModuleDb');
 
 class BxContactDb extends BxDolModuleDb
 {
-    var $_oConfig;
+    protected $_oConfig;
 
     /*
      * Constructor.

modules/boonex/sites/classes/BxSitesTemplate.php

@@ -28,13 +28,13 @@ class BxSitesTemplate extends BxDolModuleTemplate
         $sJsMainObject = $this->_oConfig->getJsObject();
         ob_start();
 ?>
-        var <?=$sJsMainObject; ?> = new <?=$sJsMainClass; ?>({
-            sActionUrl: '<?=BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri(); ?>',
-            sObjName: '<?=$sJsMainObject; ?>',
-            sAnimationEffect: '<?=$this->_oConfig->getAnimationEffect(); ?>',
-            iAnimationSpeed: '<?=$this->_oConfig->getAnimationSpeed(); ?>'
+        var <?php echo $sJsMainObject; ?> = new <?php echo $sJsMainClass; ?>({
+            sActionUrl: '<?php echo BX_DOL_URL_ROOT . $this->_oConfig->getBaseUri(); ?>',
+            sObjName: '<?php echo $sJsMainObject; ?>',
+            sAnimationEffect: '<?php echo $this->_oConfig->getAnimationEffect(); ?>',
+            iAnimationSpeed: '<?php echo $this->_oConfig->getAnimationSpeed(); ?>'
         });
-<?
+<?php
         $sContent = ob_get_clean();
         return $bWrap ? $this->_wrapInTagJsCode($sContent) : $sContent;
     }

samples/BxSampleForm.php

@@ -152,7 +152,7 @@ class BxSampleForm extends BxTemplFormView {
 
 class BxSampleFormCheckerHelper extends BxDolFormCheckerHelper {
     
-    var $_sDiv = ',';
+    protected $_sDiv = ',';
 
     /**
      * prepare RBG values to save to the DB

samples/image_resize.php

@@ -75,15 +75,15 @@ function PageCompMainCode() {
     ob_start();
     
 ?>
-    Source:<br /> <img border=1 style="max-width:300px;" src ="<?=BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_src" /> 
+    Source:<br /> <img border=1 style="max-width:300px;" src ="<?php echo BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_src" /> 
     <hr class="bx-def-hr" />
-    Resized:<br /> <img border=1 src ="<?=BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize" /> 
+    Resized:<br /> <img border=1 src ="<?php echo BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize" /> 
     <hr class="bx-def-hr" />
-    Autocrop resized:<br /> <img border=1 src ="<?=BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize_autocrop" /> 
+    Autocrop resized:<br /> <img border=1 src ="<?php echo BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize_autocrop" /> 
     <hr class="bx-def-hr" />
-    Square resized:<br /> <img border=1 src ="<?=BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize_square" /> 
+    Square resized:<br /> <img border=1 src ="<?php echo BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_resize_square" /> 
     <hr class="bx-def-hr" />
-    Grayscaled:<br /> <img border=1 style="max-width:300px;" src ="<?=BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_grayscale" /> 
+    Grayscaled:<br /> <img border=1 style="max-width:300px;" src ="<?php echo BX_DOL_URL_ROOT; ?>samples/image_resize.php?action=img_grayscale" /> 
 <?php
 
     return DesignBoxContent("Image Resize", ob_get_clean(), BX_DB_PADDING_DEF);

samples/interface.php

@@ -215,7 +215,7 @@ function Samples_PaddingsMargins()
     ob_start();
     ?>
 <div class="bx-def-border bx-def-padding">
-    <?=$GLOBALS['SAMPLE_TEXT']; ?>
+    <?php echo $GLOBALS['SAMPLE_TEXT']; ?>
 </div>
     <?php
     $aBlocks['.bx-def-padding'] = ob_get_clean();
@@ -223,7 +223,7 @@ function Samples_PaddingsMargins()
     ob_start();
     ?>
 <div class="bx-def-border bx-def-padding-left bx-def-padding-right">
-    <?=$GLOBALS['SAMPLE_TEXT']; ?>
+    <?php echo $GLOBALS['SAMPLE_TEXT']; ?>
 </div>
     <?php
     $aBlocks['.bx-def-padding-left .bx-def-padding-right'] = ob_get_clean();
@@ -231,7 +231,7 @@ function Samples_PaddingsMargins()
     ob_start();
     ?>
 <div class="bx-def-border bx-def-padding-sec">
-    <?=$GLOBALS['SAMPLE_TEXT']; ?>
+    <?php echo $GLOBALS['SAMPLE_TEXT']; ?>
 </div>
     <?php
     $aBlocks['.bx-def-padding-sec'] = ob_get_clean();
@@ -285,7 +285,7 @@ function Samples_Colors()
     foreach ($aClasses as $sClass) {
         ob_start();
         ?>
-<div class="bx-def-border sample-box-empty <?=$sClass; ?>">
+<div class="bx-def-border sample-box-empty <?php echo $sClass; ?>">
 </div>
         <?php
         $aBlocks['.' . implode(" .", explode(' ', $sClass))] = ob_get_clean();
@@ -302,7 +302,7 @@ function Samples_BordersCornersShadow()
     foreach ($aClasses as $sClass) {
         ob_start();
         ?>
-<div class="sample-box-empty <?=$sClass; ?>">
+<div class="sample-box-empty <?php echo $sClass; ?>">
 </div>
         <?php
         $aBlocks['.' . implode(" .", explode(' ', $sClass))] = ob_get_clean();
@@ -319,7 +319,7 @@ function Samples_ThumbsIconsUnits()
     foreach ($aClasses as $sClass) {
         ob_start();
         ?>
-<img class="<?=$sClass; ?>" src="<?=$GLOBALS['SAMPLE_THUMB']; ?>" />
+<img class="<?php echo $sClass; ?>" src="<?php echo $GLOBALS['SAMPLE_THUMB']; ?>" />
         <?php
         $aBlocks['.' . implode(" .", explode(' ', $sClass))] = ob_get_clean();
     }
@@ -327,7 +327,7 @@ function Samples_ThumbsIconsUnits()
     ob_start();
     ?>
 <div class="bx-def-unit">
-    <a href="javascript:void(0);"><img class="bx-def-thumb bx-def-thumb-size" src="<?=$GLOBALS['SAMPLE_THUMB']; ?>" /></a>
+    <a href="javascript:void(0);"><img class="bx-def-thumb bx-def-thumb-size" src="<?php echo $GLOBALS['SAMPLE_THUMB']; ?>" /></a>
     <div class="bx-def-unit-info bx-def-thumb-size-max-height bx-def-padding-left">
         <span class="bx-def-font-large">Some info here</span><br />
         <span class="bx-def-font-grayed">additional info</span>
@@ -339,7 +339,7 @@ function Samples_ThumbsIconsUnits()
     ob_start();
     ?>
 <div class="bx-def-unit">
-    <a href="javascript:void(0);"><img class="bx-def-icon bx-def-icon-size" src="<?=$GLOBALS['SAMPLE_THUMB']; ?>" /></a>
+    <a href="javascript:void(0);"><img class="bx-def-icon bx-def-icon-size" src="<?php echo $GLOBALS['SAMPLE_THUMB']; ?>" /></a>
     <div class="bx-def-unit-info bx-def-icon-size-max-height bx-def-padding-sec-left">
         Some info here
     </div>
@@ -358,8 +358,8 @@ function Samples_Fonts()
     foreach ($aClasses as $sClass => $sSampleText) {
         ob_start();
         ?>
-<div class="<?=$sClass; ?>">
-<?=$GLOBALS[$sSampleText]; ?>
+<div class="<?php echo $sClass; ?>">
+<?php echo $GLOBALS[$sSampleText]; ?>
 </div>
         <?php
         $aBlocks['.' . implode(" .", explode(' ', $sClass))] = ob_get_clean();

samples/palette.php

@@ -47,8 +47,8 @@ function PageCompMainCode() {
         $sClassBg = 'bg-col-'.$sColor;        
 ?>
         <div>
-            <div class="<?=$sClass;?> <?=$sClassBg;?>" style="<?=$sStyle;?> color:#fff;">.<?=$sClassBg;?></div>
-            <div class="<?=$sClass;?> <?=$sClassFt;?>" style="<?=$sStyle;?> border:1px solid #ccc;">.<?=$sClassFt;?></div>
+            <div class="<?php echo $sClass;?> <?php echo $sClassBg;?>" style="<?php echo $sStyle;?> color:#fff;">.<?php echo $sClassBg;?></div>
+            <div class="<?php echo $sClass;?> <?php echo $sClassFt;?>" style="<?php echo $sStyle;?> border:1px solid #ccc;">.<?php echo $sClassFt;?></div>
         </div>
 <?php
     }
@@ -61,7 +61,7 @@ function PageCompMainCode() {
         $sClass = 'bx-def-round-corners bx-def-margin-right bx-def-margin-bottom';
 ?>
         <div>
-            <div class="<?=$sClass;?> <?=$sClassBg;?> bx-def-border" style="<?=$sStyle;?>">.<?=$sClassBg;?></div>
+            <div class="<?php echo $sClass;?> <?php echo $sClassBg;?> bx-def-border" style="<?php echo $sStyle;?>">.<?php echo $sClassBg;?></div>
         </div>
 <?php
     }

studio/classes/BxDolStudioLanguagesUtils.php

@@ -125,7 +125,7 @@ class BxDolStudioLanguagesUtils extends BxDolLanguages implements iBxDolSingleto
             if($rHandle === false)
                 return false;
 
-            $sContent = "<?{$sNewLine}\$GLOBALS['LANG'] = array(";
+            $sContent = "<?php{$sNewLine}\$GLOBALS['LANG'] = array(";
             foreach($aKeys as $aKey) {
                 list($sKey, $sString) = str_replace(array("\\", "'"), array("\\\\", "\\'"), array($aKey['key'], $aKey['string']));
                 $sContent .= "{$sNewLine}\t'$sKey' => '$sString',";

template/scripts/BxBaseSearchResult.php

@@ -157,10 +157,10 @@ class BxBaseSearchResult extends BxDolSearchResult
 ?>
     <script type="text/javascript">
         function on_filter_apply (e) {
-            var s = ('' + document.location).replace (/[&]{0,1}<?=$sFilterName;?>=.*/, ''); // remove filter
+            var s = ('' + document.location).replace (/[&]{0,1}<?php echo $sFilterName;?>=.*/, ''); // remove filter
             s = s.replace(/page=\d+/, 'page=1'); // goto 1st page
-            if (e.checked && $('#<?=$sInputId;?>').val().length > 2)
-                s += (-1 == s.indexOf('?') ? '?' : '&') + '<?=$sFilterName;?>=' + $('#<?=$sInputId;?>').val(); // append filter
+            if (e.checked && $('#<?php echo $sInputId;?>').val().length > 2)
+                s += (-1 == s.indexOf('?') ? '?' : '&') + '<?php echo $sFilterName;?>=' + $('#<?php echo $sInputId;?>').val(); // append filter
             document.location = s;
         }
         function on_filter_key_up (e) {
@@ -174,7 +174,7 @@ class BxBaseSearchResult extends BxDolSearchResult
             }
         }
     </script>
-<?
+<?php
             $sJsContent = ob_get_clean();
         }
 

upgrade/classes/BxDolUpgradeController.php

@@ -9,8 +9,8 @@
 
 class BxDolUpgradeController {
 
-    var $oDb;
-    var $oUtil;
+    protected $oDb;
+    protected $oUtil;
 
     function BxDolUpgradeController() {
         $this->oDb = new BxDolUpgradeDb();

upgrade/classes/BxDolUpgradeDb.php

@@ -348,8 +348,8 @@ EOJ;
             ?>
                 <div style="border:2px solid red;padding:4px;width:600px;margin:0px auto;">
                     <div style="text-align:center;background-color:red;color:white;font-weight:bold;">Error</div>
-                    <div style="text-align:center;"><?=$out?></div>
-            <?
+                    <div style="text-align:center;"><?php echo $out?></div>
+            <?php
             if( BX_UPGRADE_DB_FULL_DEBUG_MODE )
             {
                 if( strlen( $query ) )
@@ -368,7 +368,7 @@ EOJ;
             }
             ?>
                 </div>
-            <?
+            <?php
         }
         else
             echo $out;

upgrade/classes/BxDolUpgradeUtil.php

@@ -9,8 +9,8 @@
 
 class BxDolUpgradeUtil {
 
-    var $oDb;
-    var $sFolder;
+    protected $oDb;
+    protected $sFolder;
 
     function BxDolUpgradeUtil($oDb) {
         $this->oDb = $oDb;