Trident

inc/classes/BxDol.php

@@ -18,7 +18,7 @@
 $GLOBALS['bxDolClasses'] = array();
 
 /**
- * Base class for all Dolphin classes
+ * Base class for all classes
  */
 class BxDol
 {

inc/classes/BxDolCron.php

@@ -8,9 +8,9 @@
  */
 
 /**
- * BxDolCron is parent class for all Dolphin cron jobs, except the cases when the code is evaluated directly.
+ * BxDolCron is parent class for all cron jobs, except the cases when the code is evaluated directly.
  *
- * periodic/cron.php file is used for cron jobs. It is started every minute and runs Dolphin cron jobs.
+ * periodic/cron.php file is used for cron jobs. It is started every minute and run cron jobs.
  * The file runs jobs at regular intervals, the jobs are listed in `sys_cron_jobs` table.
  *
  * Fields shark_cron_jobs table:

inc/classes/BxDolFtp.php

@@ -33,7 +33,7 @@ class BxDolFtp extends BxDolFile
         return @ftp_login($this->_rStream, $this->_sLogin, $this->_sPassword);
     }
 
-    function isDolphin()
+    function isTrident()
     {
         return @ftp_size($this->_rStream, $this->_sPathTo . 'inc/header.inc.php') > 0;
     }

inc/classes/BxDolModule.php

@@ -22,7 +22,7 @@
  *
  *
  * Example of usage:
- * @see any module included in the default Dolphin's package.
+ * refer to any BoonEx module
  *
  *
  * Static Methods:

inc/classes/BxDolModuleConfig.php

@@ -14,7 +14,7 @@
  *
  *
  * Example of usage:
- * @see any module included in the default Dolphin's package.
+ * refer to any BoonEx module
  *
  *
  * Memberships/ACL:

inc/classes/BxDolObject.php

@@ -8,7 +8,7 @@
  */
 
 /**
- * Base class for all Dolphin Object classes.
+ * Base class for all "Object" classes.
  * Child classes usually represents high level programming constructions to generate ready 'objects' functionality, like Comments, Votings, Forms.
  */
 class BxDolObject extends BxDol

inc/classes/BxDolPrivacy.php

@@ -37,18 +37,20 @@ define('BX_DOL_PG_DEFAULT', BX_DOL_PG_ALL);
  * 2. Add one privacy field(with INT type) in the table with your items for each action.
  *    For example, for action 'comment', the field name should be 'allow_comment_to'.
  * 3. Add group choosers for necessary actions in the form, which is used to add new items.
- *
+ * @code
  *    $oPrivacy = new BxDolPrivacy();
  *    $oPrivacy->getGroupChooser($iItemOwnerId, $sModuleUri, $sModuleAction);
+ * @endcode
  *
  * 4. Check privacy when any user tries to view an item.
- *
+ * @code
  *    $oPrivacy = new BxDolPrivacy($sTable, $sFieldId, $sFieldOwnerId);
  *    if($oPrivacy->check($sAction, $iObjectId, $iViewerId)) {
  *     //show necessary content
  *    }
+ * @endcode
  *
- *    @see an example of integration in the default Dolphin's modules(feedback, events, sites, etc)
+ *    @see an example of integration in BoonEx modules, for example: Posts
  *
  *
  * Memberships/ACL:

inc/classes/BxDolSearch.php

@@ -32,7 +32,7 @@ define('BX_DOL_SEARCH_KEYWORD_PAGE', 'site-search-page');
  *
  * For using this class you should have unit of BxDolSearchResult class (see description below) with method processing which is responsible for processing of search request.
  *
- * Example of usage can be seen in the default Dolphin's modules (photos, sounds, events, sites, etc).
+ * Example of usage can be seen in the BoonEx modules, for example: Posts
  *
  * Memberships/ACL:
  * Doesn't depend on user's membership.

inc/classes/BxDolService.php

@@ -12,13 +12,12 @@ bx_import('BxDolRequest');
 /**
  * Service calls to modules' methods.
  *
- * The class has one static method is needed to make service calls
- * to module's methods from the Dolphin's core or the other modules.
+ * The class has one static method to make service calls to the module's methods
  *
  *
  * Example of usage:
  * @code
- * BxDolService::call('payment', 'get_add_to_cart_link', array($iVendorId, $mixedModuleId, $iItemId, $iItemCount));
+ * $isSpam = BxDolService::call('bx_antispam', 'is_spam', array($sText));
  * @endcode
  *
  *

inc/classes/BxDolStorage.php

@@ -83,7 +83,7 @@ bx_import('BxDolStorageQuery');
  * - object - your storage object name, usually it is in the following format - vendor prefix, underscore, module prefix;
  *   for example for BoonEx Forum module it can be bx_forum.
  * - engine - storage engine, for now the following engines are supported:
- *     1. Local - local storage, by default files are stored in /storage/ subfolder in Dolphin root directory
+ *     1. Local - local storage, by default files are stored in /storage/ subfolder 
  *     2. S3 - Amazon S3 storage, files are stored on Amazon S3 storage, you need to point AWS Access Key, AWS Secret Key and AWS Bucket in the settings
  * - params - custom storage engine params as php serialized string
  * - token_life - life of the security token in seconds for private files

inc/classes/BxDolTemplate.php

@@ -576,8 +576,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
      * Note. Location is the path/url to folder where 'templates' folder is stored.
      *
      * @param string $sKey          - location's    unique key.
-     * @param string $sLocationPath - location's path. For modules: '[path_to_dolphin]/modules/[vendor_name]/[module_name]/'
-     * @param string $sLocationUrl  - location's url. For modules: '[url_to_dolphin]/modules/[vendor_name]/[module_name]/'
+     * @param string $sLocationPath - location's path. For modules: '[path_to_script]/modules/[vendor_name]/[module_name]/'
+     * @param string $sLocationUrl  - location's url. For modules: '[url_to_script]/modules/[vendor_name]/[module_name]/'
      */
     function addLocation($sKey, $sLocationPath, $sLocationUrl)
     {
@@ -591,8 +591,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
     /**
      * Add dynamic location.
      *
-     * @param  string   $sLocationPath - location's path. For modules: '[path_to_dolphin]/modules/[vendor_name]/[module_name]/'
-     * @param  string   $sLocationUrl  - location's url. For modules: '[url_to_dolphin]/modules/[vendor_name]/[module_name]/'
+     * @param  string   $sLocationPath - location's path. For modules: '[path_to_script]/modules/[vendor_name]/[module_name]/'
+     * @param  string   $sLocationUrl  - location's url. For modules: '[url_to_script]/modules/[vendor_name]/[module_name]/'
      * @return location key. Is needed to remove the location.
      */
     function addDynamicLocation($sLocationPath, $sLocationUrl)
@@ -618,8 +618,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
      * Note. Location is the path/url to folder where JS files are stored.
      *
      * @param string $sKey          - location's    unique key.
-     * @param string $sLocationPath - location's path. For modules: '[path_to_dolphin]/modules/[vendor_name]/[module_name]/js/'
-     * @param string $sLocationUrl  - location's url. For modules: '[url_to_dolphin]/modules/[vendor_name]/[module_name]/js/'
+     * @param string $sLocationPath - location's path. For modules: '[path_to_script]/modules/[vendor_name]/[module_name]/js/'
+     * @param string $sLocationUrl  - location's url. For modules: '[url_to_script]/modules/[vendor_name]/[module_name]/js/'
      */
     function addLocationJs($sKey, $sLocationPath, $sLocationUrl)
     {
@@ -631,8 +631,8 @@ class BxDolTemplate extends BxDol implements iBxDolSingleton
     /**
      * Add dynamic JS location.
      *
-     * @param  string   $sLocationPath - location's path. For modules: '[path_to_dolphin]/modules/[vendor_name]/[module_name]/'
-     * @param  string   $sLocationUrl  - location's url. For modules: '[url_to_dolphin]/modules/[vendor_name]/[module_name]/'
+     * @param  string   $sLocationPath - location's path. For modules: '[path_to_script]/modules/[vendor_name]/[module_name]/'
+     * @param  string   $sLocationUrl  - location's url. For modules: '[url_to_script]/modules/[vendor_name]/[module_name]/'
      * @return location key. Is needed to remove the location.
      */
     function addDynamicLocationJs($sLocationPath, $sLocationUrl)

inc/classes/BxDolTranscoderVideo.php

@@ -30,7 +30,7 @@ bx_import('BxDolTranscoderVideoQuery');
  * or set it to fairly big value, since video transcoding is not performed on the fly and takes some time. 
  *
  * Video conversion can be performed on separate server or multiple servers, to do it:
- * - install dolphin on separate server(s), but connect to the same DB which your main site is using
+ * - install the script on separate server(s), but connect to the same DB which your main site is using
  * - enable 'sys_transcoder_queue_files' option (when it is enabled it takes a little longer to convert videos)
  * - add the following code to the begining of inc/header.inc.php file on the main site, where your actual site in installed:
  *   @code

inc/classes/BxDolUpgrader.php

@@ -89,6 +89,15 @@ class BxDolUpgrader extends BxDol
         return $this->getError() ? false : true;
     }
 
+    public function getLatestVersionNumber ()
+    {
+        $a = $this->getVersionUpdateInfo ();
+        if (!$a)
+            return false;
+
+        return $a['latest_version'];
+    }
+
     public function getVersionUpdateInfo ()
     {
         $s = bx_file_get_contents($this->_sUrlVersionCheck, array ('v' => bx_get_ver()));

inc/utils.inc.php

@@ -1090,7 +1090,7 @@ function bx_trigger_error ($sMsg, $iNumLevelsBack = 0)
 }
 
 /**
- * Get Dolphin system DB version, for files version @see BX_DOL_VERSION, these versions must match
+ * Get system DB version, for files version @see BX_DOL_VERSION, these versions must match
  */
 function bx_get_ver ($bInvalidateCache = false)
 {
@@ -1106,7 +1106,7 @@ function bx_get_ver ($bInvalidateCache = false)
 
 /**
  * Check if site maintetance mode is enabled.
- * Maintetance mode is enabled when '.bx_maintenance' file exists in Dolphin root folder, 
+ * Maintetance mode is enabled when '.bx_maintenance' file exists in the script root folder, 
  * please note that this is hidden file and some file managers don't show it.
  * @param $bShowHttpError show 503 HTTP error if site is in mainenance mode
  * @return true if site is in maintenance mode, or false otherwise
@@ -1123,13 +1123,13 @@ function bx_check_maintenance_mode ($bShowHttpError = false)
 
 /**
  * Check for minimal requirements.
- * if DISABLE_DOLPHIN_REQUIREMENTS_CHECK is defined then this requirements checking is skipped.
+ * if BX_DISABLE_REQUIREMENTS_CHECK is defined then this requirements checking is skipped.
  * @param $bShowHttpError show 503 HTTP error if site doesn't meet minimal requirements
  * @return false if requirements are met, or array of errors of requirements aren't met
  */
 function bx_check_minimal_requirements ($bShowHttpError = false)
 {
-    if (defined('DISABLE_DOLPHIN_REQUIREMENTS_CHECK'))
+    if (defined('BX_DISABLE_REQUIREMENTS_CHECK'))
         return false;
 
     $aErrors = array();
@@ -1137,7 +1137,7 @@ function bx_check_minimal_requirements ($bShowHttpError = false)
     $aErrors[] = (ini_get('register_globals') == 0) ? '' : '<b>register_globals</b> is on (you need to disable it, or your site will be unsafe)';
     $aErrors[] = (ini_get('safe_mode') == 0) ? '' : '<b>safe_mode</b> is on (you need to disable it)';
     $aErrors[] = (version_compare(PHP_VERSION, '5.3.0', '<')) ? 'PHP version is too old (please update to <b>PHP 5.3.0</b> at least)' : '';
-    $aErrors[] = (!extension_loaded( 'mbstring')) ? '<b>mbstring</b> extension not installed (Dolphin cannot work without it)' : '';
+    $aErrors[] = (!extension_loaded( 'mbstring')) ? '<b>mbstring</b> extension not installed (the script cannot work without it)' : '';
     $aErrors[] = (ini_get('allow_url_include') == 0) ? '' : '<b>allow_url_include</b> is on (you need to disable it, or your site will be unsafe)';
 
     $aErrors = array_diff($aErrors, array('')); // delete empty

inc/version.inc.php

@@ -7,6 +7,6 @@
  * @{
  */
 
-define('BX_DOL_VERSION', '8.0.0-DEV9'); ///< Dolphin system files version, for DB version @see bx_get_ver, DB and files version must match
+define('BX_DOL_VERSION', '8.0.0-DEV9'); ///< system files version, for DB version @see bx_get_ver, DB and files version must match
 
 /** @} */

install/classes/BxDolInstallSiteConfig.php

@@ -115,14 +115,14 @@ class BxDolInstallSiteConfig
             ),
             'db_name' => array(
                 'name' => _t('_sys_inst_conf_field_db_name'),
-                'ex' => 'mydomian_dolphin',
+                'ex' => 'mydomian_tri',
                 'desc' => _t('_sys_inst_conf_desc_db_name'),
                 'check' => array('checkLength', 1),
                 'db_conf' => 'name',
             ),
             'db_user' => array(
                 'name' => _t('_sys_inst_conf_field_db_user'),
-                'ex' => 'mydomian_dolphin',
+                'ex' => 'mydomian_tri',
                 'desc' => _t('_sys_inst_conf_desc_db_user'),
                 'check' => array('checkLength', 1),
                 'db_conf' => 'user',

install/cmd.php

@@ -38,11 +38,11 @@ class BxDolInstallCmd
             'db_name' => 'test',
             'db_user' => 'root',
             'db_password' => 'root',
-            'site_title' => 'Dolphin U Test',
+            'site_title' => 'Trident Test',
             'site_email' => 'no-reply@example.com',
             'admin_email' => 'admin@example.com',
             'admin_username' => 'admin',
-            'admin_password' => 'dolphin',
+            'admin_password' => 'trident',
             'language' => 'en',
         );
 

install/css/styles.css

@@ -44,7 +44,7 @@ html, body {
     float:right;
 }
 
-.bx-install-initial img.bx-install-dolphin {
+.bx-install-initial img.bx-install-img {
     display:block;
     margin-left:auto;
     margin-right:auto;

install/general.css

@@ -1,389 +0,0 @@
-    body
-    {
-        margin:0px;
-        padding:0px;
-        background-color:#EDEDED;
-        color:#3F3F3F;
-        font-family:Arial, Helvetica, sans-serif;
-        font-size:13px;
-    }
-    a:link, a:visited
-    {
-        color:#00C;
-        text-decoration:underline;
-    }
-    a:active, a:hover
-    {
-        color:#FF412D;
-        text-decoration:underline;
-    }
-    a img
-    {
-        border:none;
-    }
-/*---------------------------*/
-    div#main
-    {
-        /*position:relative;*/
-        width:776px;
-        margin-left:auto;
-        margin-right:auto;
-        margin-top:15px;
-        margin-bottom:15px;
-        background-color:#FFF;
-        border:1px solid #999;
-    }
-    div#header
-    {
-        /*position:relative;*/
-        height:100px;
-        margin:auto;
-        width:250px;
-        margin-top:30px;
-    }
-    /*div.intro
-    {
-        position:absolute;
-        top:70px;
-        left:170px;
-        color:#333366;
-        font-size:30px;
-        font-weight:bold;
-    }
-    div.version
-    {
-        position:absolute;
-        top:5px;
-        right:5px;
-        text-transform:uppercase;
-        color:#333366;
-        text-align:left;
-    }*/
-/*---------------------------*/
-    div#footer
-    {
-        /*padding-left:15px;*/
-        padding-top:15px;
-        padding-bottom:15px;
-        width:250px;
-        margin:auto;
-    }
-/*---------------------------*/
-    div#content
-    {
-        border-top:0px solid #999999;
-        border-bottom:0px solid #999999;
-        padding:15px;
-    }
-    * html div#content
-    {
-        height:500px;
-    }
-    div.position
-    {
-        /*position:relative;*/
-        border:0px solid red;
-        font-size:24px;
-        font-weight:bold;
-        width:545px;
-        color:#39C;
-    }
-    div#content div.LeftRirght
-    {
-        /*position:relative;*/
-        border:0px solid blue;
-        margin-left:auto;
-        margin-right:auto;
-        overflow:hidden;
-        width:100%;
-    }
-
-    div#content div.LeftRight
-        {
-        /*position:relative;*/
-        border:0px solid blue;
-        margin-left:auto;
-        margin-right:auto;
-        overflow:hidden;
-        width:545px;
-    }
-
-    div#content div.left
-    {
-        /*position:relative;*/
-        border:0px solid green;
-        overflow:hidden;
-        margin-bottom:16px;
-    }
-    div#content div.right
-    {
-        /*position:relative;*/
-        border:0px solid red;
-        overflow:hidden;
-    }
-
-    tr.head td
-    {
-        text-align:center;
-        font-weight:bold;
-        height:17px;
-        padding:5px;
-        background-color:#fff;
-    }
-    tr.cont td
-    {
-        height:15px;
-        padding:2px 5px;
-    }
-
-    tr.cont td.span
-    {
-        padding: 2px 0px;
-        text-align: center;
-    }
-
-    tr.cont td div
-    {
-        border:0px solid red;
-        height:20px;
-        line-height:20px;
-        vertical-align:middle;
-    }
-    span.writable
-    {
-        /*font-weight:bold;*/
-        color:green;
-        margin-right:5px;
-    }
-    span.unwritable
-    {
-        /*font-weight:bold;*/
-        color:red;
-        margin-right:5px;
-    }
-    span.desired
-    {
-        /*font-weight:bold;*/
-        margin-right:5px;
-    }
-
-/*---------------------------*/
-    .clearBoth
-    {
-        /*position:relative;*/
-        clear:both;
-        height:1px;
-        margin:0px;
-        padding:0px;
-        font-size:1px;
-        border:0px solid red;
-    }
-    div.error
-    {
-        /*position:relative;*/
-        border:1px solid #ef4f4f;
-        background-color:#f9adad;
-        padding:15px;
-        margin-left:170px;
-        font-size:16px;
-    }
-
-/*---------------------------*/
-    input.button
-    {
-        border:1px solid silver;
-        background-color:#f1f1f1;
-    }
-    div.debug
-    {
-        padding:5px;
-        margin-bottom:10px;
-        border:1px solid silver;
-        font-size:13px;
-    }
-    div.formKeeper
-    {
-        /*position:relative;*/
-        margin-top:10px;
-        margin-bottom:10px;
-        margin-left:auto;
-        margin-right:auto;
-        width:207px;
-        text-align:center;
-    }
-
-    div.formKeeper1
-    {
-        /*position:relative;*/
-        margin-top:10px;
-        margin-bottom:10px;
-        margin-left:auto;
-        margin-right:auto;
-        width:314px;
-        text-align:center;
-    }
-
-    input, select
-    {
-        font-size:11px;
-        background-color:#FFFFFF;
-        border:1px solid #ccc;
-    }
-
-    input#button
-    {
-        border:0px;
-    }
-
-    textarea.headerTextarea
-    {
-        border:1px solid silver;
-        background-color:#fff;
-        width:710px;
-        height:150px;
-    }
-
-    .image_copy
-    {
-        margin-top:10px;
-        margin-left:auto;
-        margin-right:auto;
-        width:100px;
-    }
-
-/*---------------------------*/
-    .install_pic
-    {
-        /*position:relative;*/
-        width:325px;
-        height:45px;
-        background-image:url('images/dolphin_install.jpg');
-        background-repeat:no-repeat;
-        margin:auto;
-        padding-top:280px;
-        text-align:center;
-        color:#2E86B3;
-        font-weight:bold;
-        font-size:24px;
-        text-transform:capitalize;
-    }
-
-    .installed_pic
-    {
-        /*position:relative;*/
-        width:325px;
-        height:325px;
-        margin:auto;
-    }
-
-    .install_text
-    {
-        /*position:relative;*/
-        width:326px;
-        margin-right:auto;
-        margin-left:auto;
-        margin-top:35px;
-        text-align:center;
-        color:#666;
-        font-size:11px;
-    }
-
-    .installed_text
-    {
-        /*position:relative;*/
-        width:400px;
-        margin-right:auto;
-        margin-left:auto;
-        margin-top:35px;
-        text-align:center;
-        font-weight:bold;
-        color:#C33;
-        font-size:24px;
-    }
-
-    .install_button
-    {
-        /*position:relative;*/
-        width:100px;
-        margin:auto;
-        margin-top:30px;
-    }
-
-    div#topActive
-    {
-        /*position:relative;*/
-        float:left;
-        padding:0px 7px;
-        height:26px;
-        line-height:22px;
-        background-image:url('images/bg_active.gif');
-        background-repeat:repeat-x;
-        font-weight:bold;
-        font-size:11px;
-        color:#FFF;
-    }
-    div#topInactive
-    {
-        /*position:relative;*/
-        float:left;
-        padding:0px 7px;
-        height:26px;
-        line-height:22px;
-        background-image:url('images/bg_inactive.gif');
-        background-repeat:repeat-x;
-        font-weight:bold;
-        font-size:11px;
-        color:#666;
-    }
-
-    div#topMenuActive
-    {
-        /*position:relative;*/
-        width:776px;
-        height:26px;
-        background-image:url('images/bg_active.gif');
-        background-repeat:repeat-x;
-    }
-
-    div#topMenuInactive
-    {
-        /*position:relative;*/
-        width:776px;
-        height:26px;
-        background-image:url('images/bg_inactive.gif');
-        background-repeat:repeat-x;
-    }
-
-    div#topMenu
-    {
-        /*position:relative;*/
-        width:776px;
-        height:26px;
-        background-image:url('images/bg_inactive.gif');
-        background-repeat:repeat-x;
-    }
-
-    .button_area_1
-    {
-        width:100px;
-        float:left;
-        margin-right:7px;
-    }
-
-    .button_area_2
-    {
-        width:100px;
-        float:left;
-    }
-
-    div#topMenuActive img, div#topMenuInactive img
-    {
-        /*position:relative;*/
-        float:left;
-        height:26px;
-    }
-
-    /*overrided for install only*/
-    img.warn {
-        display:none;
-    }

install/templates/initial.php

@@ -1,6 +1,6 @@
 <div class="bx-install-initial">
 
-    <img class="bx-def-margin-bottom bx-install-dolphin" src="img/dolphin.png" alt="Dolphin U" />
+    <img class="bx-def-margin-bottom bx-install-img" src="img/trident.png" alt="Trident" />
 
     <?php include('lang_swither.php'); ?>
 

plugins/OAuth/OAuth1/Service/Dolphin.php

@@ -3,7 +3,7 @@
  * Copyright (c) BoonEx Pty Limited - http://www.boonex.com/
  * CC-BY License - http://creativecommons.org/licenses/by/3.0/
  *
- * @defgroup    DolphinStudio Dolphin Studio
+ * @defgroup    TridentStudio Trident Studio
  * @{
  */
 

samples/BxGridMy.php

@@ -75,8 +75,8 @@ INSERT INTO `sample_grid_data` VALUES
 (35, 'MrTwister', 'mr@twister.com', 'Active', 1, '', '', '', '', 'Mumbai', '0000-00-00', '', 6),
 (42, 'kokoko', 'okokok@ok.com', 'Unconfirmed', 1, '', '', '', '', 'Ok', '0000-00-00', '', 10),
 (34, 'uno', 'uno@boonex.com', 'Active', 1, '', '', '', '', 'Sydney', '0000-00-00', '', 9),
-(41, 'Dolphin User', 'user@dolphin.co', 'Active', 1, '', '', '', '', 'Seashore', '0000-00-00', '', 2),
-(10, 'Andrew5', 'uno5@boonex.com', 'Active', 1, 'male', 'Unite People!', '<p>This is a demo profile that you may find on <a href="http://www.boonex.com/dolphin">BoonEx Dolphin</a> demo sites or some default Dolphin installations. This and other demo profiles are used to post sample media content, messages and friend requests.</p>\r\n<p> </p>\r\n<p>Dolphin is a free, open-source social networking and online dating platform by <a href="http://www.boonex.com">BoonEx Community Software Experts</a>.</p>\r\n<p> </p>\r\n<p>BoonEx mission is to Unite People and thus make the world a better place.</p>', 'AU', 'Castle Hill', '1981-03-31', 'boonex, dolphin, community, unite, people', 10),
+(41, 'Super User', 'user@super.co', 'Active', 1, '', '', '', '', 'Seashore', '0000-00-00', '', 2),
+(10, 'Andrew5', 'uno5@boonex.com', 'Active', 1, 'male', 'Unite People!', '<p>This is a demo profile that you may find on <a href="http://www.boonex.com/">BoonEx</a>.<p>BoonEx mission is to Unite People and thus make the world a better place.</p>', 'AU', 'Castle Hill', '1981-03-31', 'boonex, community, unite, people', 10),
 (47, 'Bimbo', 'bambi@bumba.com', 'Unconfirmed', 1, '', '', '', '', 'Bomba', '0000-00-00', '', 3),
 (50, 'X-Man', 'x@man.me', 'Unconfirmed', 1, '', '', '', '', 'Movie City', '0000-00-00', '', 10);
 

samples/palette.php

@@ -13,7 +13,7 @@
  */
 
 /**
- * This sample shows default Dolphin palette colors.
+ * This sample shows default palette colors.
  * Palette colors are defined as css classes.
  */
 

studio/classes/BxDolStudioInstaller.php

@@ -16,12 +16,12 @@ define("BX_DOL_STUDIO_INSTALLER_FAILED", 1);
  * Base class for Installer classes in modules engine.
  *
  * The class contains different check functions which are used during the installation process.
- * An object of the class is created automatically with Dolphin's modules installer.
+ * An object of the class is created automatically with modules installer.
  * Installation/Uninstallation process can be controlled with config.php file located in  [module]/install/ folder.
  *
  *
  * Example of usage:
- * @see any module included in the default Dolphin's package.
+ * refer to the BoonEx modules
  *
  *
  * Memberships/ACL:
@@ -884,7 +884,7 @@ class BxDolStudioInstaller extends BxDolInstallerUtils
             if(!$oFile->connect())
                 return null;
 
-            if(!$oFile->isDolphin())
+            if(!$oFile->isTrident())
                 return null;
         }
         else {

studio/classes/BxDolStudioInstallerUtils.php

@@ -506,7 +506,7 @@ class BxDolStudioInstallerUtils extends BxDolInstallerUtils implements iBxDolSin
 	        if(!$oFile->connect())
 	            return _t('_adm_str_err_cannot_connect_to_ftp');
 	
-	        if(!$oFile->isDolphin())
+	        if(!$oFile->isTrident())
 	            return _t('_adm_str_err_destination_not_valid');
         }
         else {

studio/classes/BxDolStudioTemplate.php

@@ -106,16 +106,6 @@ class BxDolStudioTemplate extends BxDolTemplate implements iBxDolSingleton
                 bx_import('BxTemplStudioMenuTop');
                 $sRet = BxTemplStudioMenuTop::getInstance()->getCode();
                 break;
-            case 'boonex_promo':
-                if (getParam('enable_dolphin_footer'))
-                    $sRet = $this->parseHtmlByName('boonex_promo.html', array());
-                break;
-            case 'promo_code':
-                if (defined('BX_PROMO_CODE'))
-                    $sRet = BX_PROMO_CODE;
-                else
-                    $sRet = ' ';
-                break;
             case 'copyright':
                 $sRet = _t( '_copyright',   date('Y') ) . getVersionComment();
                 break;

studio/classes/BxDolStudioTools.php

@@ -38,6 +38,11 @@ class BxDolStudioTools extends BxDolIO
             defined('BX_SYSTEM_FFMPEG') ? bx_ltrim_str(BX_SYSTEM_FFMPEG, BX_DIRECTORY_PATH_ROOT) : 'plugins/ffmpeg/ffmpeg.exe',
         );
 
+        // remove 'inc' folder if script is already installed
+        if (defined('BX_DOL'))
+            array_shift($this->aInstallPermissions);
+
+
         $this->aPostInstallPermissions = array(
         );
 

studio/classes/BxDolStudioToolsAudit.php

@@ -25,7 +25,7 @@ class BxDolStudioToolsAudit extends BxDol
     protected $sMinMysqlVer;
     protected $aMysqlOptimizationSettings;
 
-    protected $aDolphinOptimizationSettings;
+    protected $aOptimizationSettings;
 
     protected $aRequiredApacheModules;
 
@@ -84,7 +84,7 @@ class BxDolStudioToolsAudit extends BxDol
             'thread_cache_size ' => array('op' => '>', 'val' => 0),
         );
 
-        $this->aDolphinOptimizationSettings = array (
+        $this->aOptimizationSettings = array (
             'DB cache' => array('enabled' => 'sys_db_cache_enable', 'cache_engine' => 'sys_db_cache_engine', 'check_accel' => true),
             'Page blocks cache' => array('enabled' => 'sys_pb_cache_enable', 'cache_engine' => 'sys_pb_cache_engine', 'check_accel' => true),
             'Member menu cache' => array('enabled' => 'always_on', 'cache_engine' => 'sys_mm_cache_engine', 'check_accel' => true),
@@ -199,7 +199,7 @@ class BxDolStudioToolsAudit extends BxDol
     }
 
     /**
-     * Check minimal Dolphin requirements
+     * Check minimal requirements
      * @param $sType - BX_DOL_AUDIT_FAIL, BX_DOL_AUDIT_WARN, BX_DOL_AUDIT_UNDEF or BX_DOL_AUDIT_OK
      * @param $sFunc - requirementsPHP, requirementsMySQL or requirementsWebServer
      * @return array of FAIL, WARN, UNDEF or OK items, if array is empty then no specified items are found
@@ -341,28 +341,25 @@ class BxDolStudioToolsAudit extends BxDol
 
     protected function siteSetup()
     {
-        $sDolphinPath = defined('BX_DIRECTORY_PATH_ROOT') ? BX_DIRECTORY_PATH_ROOT : BX_INSTALL_DIR_ROOT;
-        $sFfmpegPath = defined('BX_SYSTEM_FFMPEG') ? BX_SYSTEM_FFMPEG : '';
+        $sFfmpegPath = defined('BX_SYSTEM_FFMPEG') ? BX_SYSTEM_FFMPEG : BX_DIRECTORY_PATH_PLUGINS . 'ffmpeg/ffmpeg.exe';
 
         $sEmailToCkeckMailSending = class_exists('BxDolDb') && BxDolDb::getInstance() ? BxDolDb::getInstance()->getParam('site_email') : '';
 
-        $sLatestDolphinVer = file_get_contents("http://rss.boonex.com/");
-        if (preg_match ('#<dolphin>([\.0-9]+)</dolphin>#', $sLatestDolphinVer, $m))
-            $sLatestDolphinVer = $m[1];
-        else
-            $sLatestDolphinVer = 'undefined';
+        bx_import('BxDolUpgrader');
+        $oUpgrader = new BxDolUpgrader();
+        if (!($sLatestVer = $oUpgrader->getLatestVersionNumber()))
+            $sLatestVer = 'undefined';
 
-        $sDolphinVer = bx_get_ver();
+        $sVer = bx_get_ver();
         $aMessage = array('type' => BX_DOL_AUDIT_OK);
-        if (!version_compare($sDolphinVer, $sLatestDolphinVer, '>='))
-            $aMessage = array('type' => BX_DOL_AUDIT_WARN, 'msg' => _t('_sys_audit_msg_version_is_outdated', $sLatestDolphinVer));
+        if (!version_compare($sVer, $sLatestVer, '>='))
+            $aMessage = array('type' => BX_DOL_AUDIT_WARN, 'msg' => _t('_sys_audit_msg_version_is_outdated', $sLatestVer));
 
-        $s = $this->getBlock(_t('_sys_audit_version_script'), $sDolphinVer, $this->getMsgHTML(_t('_sys_audit_version_script'), $aMessage));
+        $s = $this->getBlock(_t('_sys_audit_version_script'), $sVer, $this->getMsgHTML(_t('_sys_audit_version_script'), $aMessage));
 
         $s .= $this->getBlock(_t('_sys_audit_permissions'), '', _t('_sys_audit_msg_permissions'));
 
-        if ($sFfmpegPath)
-            $s .= $this->getBlock('ffmpeg', '', _t('_sys_audit_msg_ffmpeg', `{$sFfmpegPath} 2>&1`));
+        $s .= $this->getBlock('ffmpeg', '', _t('_sys_audit_msg_ffmpeg', `{$sFfmpegPath} 2>&1`));
 
         $s .= $this->getBlock(_t('_sys_audit_mail_sending'), '', _t('_sys_audit_msg_mail_sending'));
 
@@ -384,7 +381,7 @@ class BxDolStudioToolsAudit extends BxDol
         $this->optimizationWebServer();
 
         if (!defined('BX_DOL_INSTALL'))
-            $this->optimizationDolphin();
+            $this->optimizationScript();
     }
 
     protected function optimizationPhp()
@@ -440,10 +437,10 @@ class BxDolStudioToolsAudit extends BxDol
         echo $this->getSection(_t('_sys_audit_section_webserver'), '', $s);
     }
 
-    protected function optimizationDolphin()
+    protected function optimizationScript()
     {
         $s = '';
-        foreach ($this->aDolphinOptimizationSettings as $sName => $a) {
+        foreach ($this->aOptimizationSettings as $sName => $a) {
 
             $sVal = ('always_on' == $a['enabled'] || getParam($a['enabled'])) ? 'On' : 'Off';
             if ($a['cache_engine'])
@@ -459,7 +456,7 @@ class BxDolStudioToolsAudit extends BxDol
             $s .= $this->getBlock($sName, $sVal, $this->getMsgHTML($sName, $aMessage));
         }
 
-        echo $this->getSection('Dolphin', '', $s);
+        echo $this->getSection('Trident', '', $s);
     }
 
     protected function manualCheck()

studio/classes/BxDolStudioUpdater.php

@@ -60,7 +60,7 @@ class BxDolStudioUpdater extends BxDolStudioInstaller
                 'result' => false
             ));
 
-		//--- Check Dolphin version compatibility ---//
+		//--- Check version compatibility ---//
         if(!$this->_isCompatibleWith())
             return array(
                 'message' => $this->_displayResult('check_script_version', false, _t('_adm_err_modules_wrong_version_script_update', $aModuleInfo['title']), $bHtmlResponce),

tests/README.md

@@ -1,7 +1,7 @@
 ABOUT
 =====
 
-Unit test for Dolphin.
+Unit test for Trident.
 
 INSTALLATION
 ============
@@ -22,7 +22,7 @@ or:
 composer install
 ```
 
-Alternatively run the following from Dolphin root folder:
+Alternatively run the following from the script root folder:
 ```
 phing install
 ```
@@ -40,7 +40,7 @@ or:
 /path/to/bin/php ./vendor/bin/phpunit
 ```
 
-Alternatively run the following from Dolphin root folder:
+Alternatively run the following from the script root folder:
 ```
 phing test
 ```

tests/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "BoonEx/Dolphin Tests",
+    "name": "BoonEx/Trident Tests",
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "sebastian/phpcpd": "*",

tests/units/modules/boonex/antispam/classes/BxAntispamDNSURIBlacklistsTest.php

@@ -28,10 +28,10 @@ class BxAntispamDNSURIBlacklistsTest extends BxDolTestCase
         // it is assumed that multi.surbl.org. rule is enabled
         return array(
             array("some text without urls", false), // no spam detection in text without urls
-            array("Hello. \nDolphin lives on http://www.boonex.com site", false), // no spam for good urls
-            array("Hello. \nDolphin lives on <a href=\"http://www.boonex.com\">BoonEx</a> site", false), // no spam for good urls
-            array("Hello. \nDolphin lives on <a href='http://www.boonex.com'>BoonEx</a> site", false), // no spam for good urls
-            array("Hello. \nDolphin lives on <a href=http://www.boonex.com>BoonEx</a> site", false), // no spam for good urls
+            array("Hello. \nTrident can be found on http://www.boonex.com site", false), // no spam for good urls
+            array("Hello. \nTrident can be found on <a href=\"http://www.boonex.com\">BoonEx</a> site", false), // no spam for good urls
+            array("Hello. \nTrident can be found on <a href='http://www.boonex.com'>BoonEx</a> site", false), // no spam for good urls
+            array("Hello. \nTrident can be found on <a href=http://www.boonex.com>BoonEx</a> site", false), // no spam for good urls
             array("Hello. \nThere is spam on http://surbl-org-permanent-test-point.com site", true), // text with spammer URL
             array("Hello. \nThere is spam on <a href=\"http://surbl-org-permanent-test-point.com\">test point</a> site", true), // text with spammer URL
             array("Hello. \nThere is spam on <a href='http://surbl-org-permanent-test-point.com'>test point</a> site", true), // text with spammer URL