Skip to content

Commit

Permalink
Dev Changed array syntax to []
Browse files Browse the repository at this point in the history
  • Loading branch information
@SamMousa
SamMousa committed Sep 1, 2015
1 parent 2025e62 commit 5ebfa70
Show file tree
Hide file tree
Showing 45 changed files with 1,410 additions and 11,023 deletions.
215 changes: 91 additions & 124 deletions application/config/third_party.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* This file contains package definition for third party libraries.
* Defining them here allows for easy inclusion in views.
*/
return array(
return [
'ExpressionManager' => [
'baseUrl' => 'scripts/expressions',
'js' => [
Expand All @@ -15,156 +15,123 @@
],
'depends' => ['jquery']
],
'jquery' => array(
'jquery' => [
'baseUrl' => $bowerAssetPath . '/jquery/dist',
'js' => array(
'js' => [
'jquery.min.js'
)
),
'jqgrid' => array(
'baseUrl' => 'third_party/jqgrid/',
'js' => array(
'js/jquery.jqGrid.min.js',
'js/i18n/grid.locale-en.js',
]
],
'jqgrid' => [
'baseUrl' => $bowerAssetPath . '/jqgrid/',
'js' => [
'js/minified/jquery.jqGrid.min.js',
'js/minified/i18n/grid.locale-en.js',
'plugins/jquery.searchFilter.js'
),
'css' => array(
],
'css' => [
'css/ui.jqgrid.css'
),
'depends' => array(
],
'depends' => [
'jquery'
)
]

),
'jqgrid.addons' => array(
'baseUrl' => 'third_party/jqgrid/plugins/',
'js' => array(
],
'jqgrid.addons' => [
'baseUrl' => $bowerAssetPath . '/jqgrid/plugins/',
'js' => [
'grid.addons.js'
),
'depends' => array(
],
'depends' => [
'jqgrid'
)
),
'jqueryui' => array(
]

],
'jqueryui' => [
'baseUrl' => $bowerAssetPath . '/jquery-ui/',
'js' => array(
'js' => [
'jquery-ui.min.js'
),
'depends' => array(
],
'depends' => [
'jquery',
)
),
]
],

'jquery-cookie' => array(
'baseUrl' => 'third_party/jquery-cookie',
'js' => array(
'jquery.cookie.js'
),
'depends' => array(
'jquery'
)
),
'jquery-superfish' => array(
'baseUrl' => 'third_party/jquery-superfish',
'js' => array(
'js/superfish.js',
'js/hoverIntent.js'
),
'css' => array(
'css/superfish.css'
),
'depends' => array(
'jquery'
)

),
'jquery-json' => array(
'baseUrl' => 'third_party/jquery-json',
'js' => array(
'jquery.json-2.4.min.js'
),
'depends' => array(
'jquery'
)
),
'qTip2' => array(
'baseUrl' => 'third_party/qTip2',
'js' => array(
'dist/jquery.qtip.min.js'
),
'css' => array(
'dist/jquery.qtip.min.css'
),
'depends' => array(

'qTip2' => [
'baseUrl' => $bowerAssetPath. '/qtip2',
'js' => [
'jquery.qtip.min.js'
],
'css' => [
'jquery.qtip.min.css'
],
'depends' => [
'jquery'
)
),
'jquery-tablesorter' => array(
'baseUrl' => 'third_party/jquery-tablesorter',
'js' => array(
]

],
'jquery-tablesorter' => [
'baseUrl' => $bowerAssetPath . '/tablesorter',
'js' => [
'jquery.tablesorter.min.js'
),
'depends' => array(
],
'depends' => [
'jquery'
)
),
'ace' => array(
'baseUrl' => 'third_party/ace',
'js' => array(
]
],
'ace' => [
'baseUrl' => $bowerAssetPath . '/ace-builds-bower-patched/src',
'js' => [
'ace.js'
),
'depends' => array(
'jquery-ace'
)
),
'jquery-ace' => array(
],
],
'jquery-ace' => [
'baseUrl' => 'third_party/jquery-ace',
'js' => array(
'js' => [
'jquery.ace.js',
),
'depends' => array(
],
'depends' => [
'jquery',
)
),
'jquery-actual' => array(
'ace'
]
],
'jquery-actual' => [
'baseUrl' => $bowerAssetPath . '/jquery.actual/',
'js' => array(
'js' => [
'jquery.actual.min.js'
),
'depends' => array(
],
'depends' => [
'jquery'
)
),
'jquery-touch-punch' => array(
'baseUrl' => 'third_party/jquery-touch-punch/',
'js' => array(
]
],
'jquery-touch-punch' => [
'baseUrl' => $bowerAssetPath . '/components/jqueryui-touch-punch/',
'js' => [
'jquery.ui.touch-punch.min.js'
),
'depends' => array(
],
'depends' => [
'jqueryui'
)
),
'jqueryui-timepicker' => array(
]
],
'jqueryui-timepicker' => [
'baseUrl' => $bowerAssetPath . '/jqueryui-timepicker-addon/dist/',
'js' => array(
'js' => [
'jquery-ui-timepicker-addon.js'
),
'css' => array(
],
'css' => [
'jquery-ui-timepicker-addon.css'
),
'depends' => array(
],
'depends' => [
'jqueryui'
)
),
'leaflet' => array(
'baseUrl' => 'third_party/leaflet/',
'js' => array(
]
],
'leaflet' => [
'baseUrl' => $bowerAssetPath . '/leaflet/dist/',
'js' => [
'leaflet.js'
),
'css' => array(
],
'css' => [
'leaflet.css'
),
),
);
],
],
];
16 changes: 8 additions & 8 deletions application/controllers/AdminController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function _init()
* @param string|array $url URL. Either a string. Or array with keys url and title
* @return void
*/
public function error($message, $sURL = array())
public function error($message, $sURL = [])
{

$this->_getAdminHeader();
Expand Down Expand Up @@ -143,7 +143,7 @@ public function run($action)
{
$sDBVersion = \SettingGlobal::get('DBVersion');
if ((int) $sDBVersion < Yii::app()->getConfig('dbversionnumber') && $action != 'update' && $action != 'authentication')
$this->redirect(array('/admin/update/sa/db'));
$this->redirect(['/admin/update/sa/db']);
}

// if ($action != "update" && $action != "db")
Expand Down Expand Up @@ -190,7 +190,7 @@ public function actions()

public function getActionClasses()
{
return array(
return [
'assessments' => 'assessments',
'authentication' => 'authentication',
'checkintegrity' => 'checkintegrity',
Expand Down Expand Up @@ -223,7 +223,7 @@ public function getActionClasses()
'tokens' => 'tokens',
'translate' => 'translate',
'update' => 'update',
);
];
}

/**
Expand All @@ -243,7 +243,7 @@ public function _GetSessionUserRights($loginID)

// Let's check if I am the Initial SuperAdmin

$oUser = User::model()->findByAttributes(array('parent_id' => 0));
$oUser = User::model()->findByAttributes(['parent_id' => 0]);

if (!is_null($oUser) && $oUser->uid == $loginID)
Yii::app()->session['USER_RIGHT_INITIALSUPERADMIN'] = 1;
Expand All @@ -264,7 +264,7 @@ public function _getAdminHeader($meta = false, $return = false)
if (empty(Yii::app()->session['adminlang']))
Yii::app()->session["adminlang"] = Yii::app()->getConfig("defaultlang");

$aData = array();
$aData = [];
$aData['adminlang'] = Yii::app()->language;
$aData['languageRTL']="";
$aData['styleRTL']="";
Expand Down Expand Up @@ -388,7 +388,7 @@ public function _showadminmenu($surveyid = false)
if($aData['showupdate'])
{
$aData['aUpdateVersions'] = json_decode(\SettingGlobal::get("updateversions"),true);
$aUpdateTexts=array();
$aUpdateTexts= [];
foreach ($aData['aUpdateVersions'] as $aVersion)
{
$aUpdateTexts[]=$aVersion['versionnumber'].'('.$aVersion['build'].')';
Expand All @@ -413,6 +413,6 @@ public function _loadEndScripts()

unset(Yii::app()->session['metaHeader']);

return $this->renderPartial('/admin/endScripts_view', array());
return $this->renderPartial('/admin/endScripts_view', []);
}
}
4 changes: 2 additions & 2 deletions application/controllers/Controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ abstract class Controller extends \CController
* This array contains the survey / group / question id used by the menu widget.
* @var array
*/
public $navData = array();
public $navData = [];
/**
* Basic initialiser to the base controller class
*
Expand Down Expand Up @@ -134,7 +134,7 @@ public function filters() {
* Adds support for creating an action using PSR4 autoloading.
*
*/
protected function createActionFromMap($actionMap, $actionID, $requestActionID, $config = array())
protected function createActionFromMap($actionMap, $actionID, $requestActionID, $config = [])
{
$result = parent::createActionFromMap($actionMap, $actionID, $requestActionID, $config);
if (!isset($result)) {
Expand Down
16 changes: 8 additions & 8 deletions application/controllers/InstallerController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public function actionOptional()
// Save user
$user=new User;
// Fix UserID to 1 for MySQL even if installed in master-master configuration scenario
if (in_array(App()->db->getDriverName(), array('mysql', 'mysqli'))) {
if (in_array(App()->db->getDriverName(), ['mysql', 'mysqli'])) {
$user->uid=1;
}
$user->users_name=$sAdminUserName;
Expand All @@ -265,12 +265,12 @@ public function actionOptional()
$permission->save();
// Save global settings
$db = App()->db;
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'SessionName', 'stg_value' => App()->securityManager->generateRandomString(64)));
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'sitename', 'stg_value' => $sSiteName));
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'siteadminname', 'stg_value' => $sAdminRealName));
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'siteadminemail', 'stg_value' => $sAdminEmail));
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'siteadminbounce', 'stg_value' => $sAdminEmail));
$db->createCommand()->insert("{{settings_global}}", array('stg_name' => 'defaultlang', 'stg_value' => $sSiteLanguage));
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'SessionName', 'stg_value' => App()->securityManager->generateRandomString(64)]);
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'sitename', 'stg_value' => $sSiteName]);
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'siteadminname', 'stg_value' => $sAdminRealName]);
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'siteadminemail', 'stg_value' => $sAdminEmail]);
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'siteadminbounce', 'stg_value' => $sAdminEmail]);
$db->createCommand()->insert("{{settings_global}}", ['stg_name' => 'defaultlang', 'stg_value' => $sSiteLanguage]);
// only continue if we're error free otherwise setup is broken.
} catch (Exception $e) {
throw new Exception(sprintf('Could not add optional settings: %s.', $e));
Expand Down Expand Up @@ -404,7 +404,7 @@ private function writeConfigFile(InstallerConfigForm $config)
."\t\t\t" . "'charset' => 'utf8'," . "\n"
."\t\t\t" . "'tablePrefix' => '{$config->dbprefix}'," . "\n";

if (in_array($config->dbtype, array('mssql', 'sqlsrv', 'dblib'))) {
if (in_array($config->dbtype, ['mssql', 'sqlsrv', 'dblib'])) {
$sConfig .="\t\t\t" ."'initSQLs'=>array('SET DATEFORMAT ymd;','SET QUOTED_IDENTIFIER ON;')," . "\n";
}

Expand Down

0 comments on commit 5ebfa70

Please sign in to comment.