Skip to content

Commit

Permalink
Dev Some variable refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Dec 6, 2013
1 parent 083034b commit 0becedf
Show file tree
Hide file tree
Showing 6 changed files with 328 additions and 352 deletions.
159 changes: 76 additions & 83 deletions application/controllers/AdminController.php
View file
Expand Up @@ -28,11 +28,11 @@ protected function _init()
{
parent::_init();
App()->getComponent('bootstrap')->init();
$updatelastcheck = getGlobalSetting('updatelastcheck');
$sUpdateLastCheck = getGlobalSetting('updatelastcheck');

$this->_sessioncontrol();

if (Yii::app()->getConfig('buildnumber') != "" && Yii::app()->getConfig('updatecheckperiod') > 0 && $updatelastcheck < dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", "-". Yii::app()->getConfig('updatecheckperiod')." days"))
if (Yii::app()->getConfig('buildnumber') != "" && Yii::app()->getConfig('updatecheckperiod') > 0 && $sUpdateLastCheck < dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", "-". Yii::app()->getConfig('updatecheckperiod')." days"))
updateCheck();

//unset(Yii::app()->session['FileManagerContext']);
Expand All @@ -57,39 +57,39 @@ protected function _init()
* @param string|array $url URL. Either a string. Or array with keys url and title
* @return void
*/
public function error($message, $url = array())
public function error($message, $sURL = array())
{
$clang = $this->lang;

$this->_getAdminHeader();
$output = "<div class='messagebox ui-corner-all'>\n";
$output .= '<div class="warningheader">'.$clang->gT('Error').'</div><br />'."\n";
$output .= $message . '<br /><br />'."\n";
if (!empty($url) && !is_array($url))
$sOutput = "<div class='messagebox ui-corner-all'>\n";
$sOutput .= '<div class="warningheader">'.$clang->gT('Error').'</div><br />'."\n";
$sOutput .= $message . '<br /><br />'."\n";
if (!empty($sURL) && !is_array($sURL))
{
$title = $clang->gT('Back');
$sTitle = $clang->gT('Back');
}
elseif (!empty($url['url']))
elseif (!empty($sURL['url']))
{
if (!empty($url['title']))
if (!empty($sURL['title']))
{
$title = $url['title'];
$sTitle = $sURL['title'];
}
else
{
$title = $clang->gT('Back');
$sTitle = $clang->gT('Back');
}
$url = $url['url'];
$sURL = $sURL['url'];
}
else
{
$title = $clang->gT('Main Admin Screen');
$url = $this->createUrl('/admin');
$sTitle = $clang->gT('Main Admin Screen');
$sURL = $this->createUrl('/admin');
}
$output .= '<input type="submit" value="'.$title.'" onclick=\'window.open("'.$url.'", "_top")\' /><br /><br />'."\n";
$output .= '</div>'."\n";
$output .= '</div>'."\n";
echo $output;
$sOutput .= '<input type="submit" value="'.$sTitle.'" onclick=\'window.open("'.$sURL.'", "_top")\' /><br /><br />'."\n";
$sOutput .= '</div>'."\n";
$sOutput .= '</div>'."\n";
echo $sOutput;

$this->_getAdminFooter('http://manual.limesurvey.org', $clang->gT('LimeSurvey online manual'));

Expand Down Expand Up @@ -140,8 +140,8 @@ public function run($action)
// Check if the DB is up to date
if (Yii::app()->db->schema->getTable('{{surveys}}'))
{
$usrow = getGlobalSetting('DBVersion');
if ((int) $usrow < Yii::app()->getConfig('dbversionnumber') && $action != 'update' && $action != 'authentication')
$sDBVersion = getGlobalSetting('DBVersion');
if ((int) $sDBVersion < Yii::app()->getConfig('dbversionnumber') && $action != 'update' && $action != 'authentication')
$this->redirect(array('/admin/update/sa/db'));
}

Expand Down Expand Up @@ -177,14 +177,14 @@ public function run($action)
*/
public function actions()
{
$actions = $this->getActionClasses();
$aActions = $this->getActionClasses();

foreach ($actions as $action => $class)
foreach ($aActions as $action => $class)
{
$actions[$action] = "application.controllers.admin.{$class}";
$aActions[$action] = "application.controllers.admin.{$class}";
}

return $actions;
return $aActions;
}

public function getActionClasses()
Expand Down Expand Up @@ -233,7 +233,7 @@ public function getActionClasses()
*/
public function _GetSessionUserRights($loginID)
{
$user = User::model()->findByPk($loginID);
$oUser = User::model()->findByPk($loginID);

// SuperAdmins
// * original superadmin with uid=1 unless manually changed and defined
Expand All @@ -242,17 +242,10 @@ public function _GetSessionUserRights($loginID)

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

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

if (!is_null($user) && $user->uid == $loginID)
$initialSuperadmin=true;
else
$initialSuperadmin=false;

if ($initialSuperadmin === true)
{
if (!is_null($oUser) && $oUser->uid == $loginID)
Yii::app()->session['USER_RIGHT_INITIALSUPERADMIN'] = 1;
}
else
Yii::app()->session['USER_RIGHT_INITIALSUPERADMIN'] = 0;
}
Expand All @@ -270,55 +263,55 @@ public function _getAdminHeader($meta = false, $return = false)
if (empty(Yii::app()->session['adminlang']))
Yii::app()->session["adminlang"] = Yii::app()->getConfig("defaultlang");

$data = array();
$data['adminlang'] = Yii::app()->session['adminlang'];
$aData = array();
$aData['adminlang'] = Yii::app()->session['adminlang'];

//$data['admin'] = getLanguageRTL;
$data['test'] = "t";
$data['languageRTL']="";
$data['styleRTL']="";
$aData['test'] = "t";
$aData['languageRTL']="";
$aData['styleRTL']="";

Yii::app()->loadHelper("surveytranslator");

if (getLanguageRTL(Yii::app()->session["adminlang"]))
{
$data['languageRTL'] = " dir=\"rtl\" ";
$data['bIsRTL']=true;
$aData['languageRTL'] = " dir=\"rtl\" ";
$aData['bIsRTL']=true;
}
else
{
$data['bIsRTL']=false;
$aData['bIsRTL']=false;
}

$data['meta']="";
$aData['meta']="";
if ($meta)
{
$data['meta']=$meta;
$aData['meta']=$meta;
}

$data['baseurl'] = Yii::app()->baseUrl . '/';
$data['datepickerlang']="";
$aData['baseurl'] = Yii::app()->baseUrl . '/';
$aData['datepickerlang']="";
if (Yii::app()->session["adminlang"] != 'en')
Yii::app()->getClientScript()->registerScriptFile(App()->baseUrl . "/third_party/jqueryui/development-bundle/ui/i18n/jquery.ui.datepicker-" . Yii::app()->session['adminlang'] .".js");


$data['sitename'] = Yii::app()->getConfig("sitename");
$data['admintheme'] = Yii::app()->getConfig("admintheme");
$data['firebug'] = useFirebug();
$aData['sitename'] = Yii::app()->getConfig("sitename");
$aData['admintheme'] = Yii::app()->getConfig("admintheme");
$aData['firebug'] = useFirebug();

if (!empty(Yii::app()->session['dateformat']))
$data['formatdata'] = getDateFormatData(Yii::app()->session['dateformat']);
$aData['formatdata'] = getDateFormatData(Yii::app()->session['dateformat']);

$out = $this->renderPartial("/admin/super/header", $data, true);
$sOutput = $this->renderPartial("/admin/super/header", $aData, true);


if ($return)
{
return $out;
return $sOutput;
}
else
{
echo $out;
echo $sOutput;
}
}

Expand All @@ -334,31 +327,31 @@ public function _getAdminHeader($meta = false, $return = false)
public function _getAdminFooter($url, $explanation, $return = false)
{
$clang = $this->lang;
$data['clang'] = $clang;
$aData['clang'] = $clang;

$data['versionnumber'] = Yii::app()->getConfig("versionnumber");
$aData['versionnumber'] = Yii::app()->getConfig("versionnumber");

$data['buildtext'] = "";
$aData['buildtext'] = "";
if(Yii::app()->getConfig("buildnumber")!="") {
$data['buildtext']= "Build ".Yii::app()->getConfig("buildnumber");
$aData['buildtext']= "Build ".Yii::app()->getConfig("buildnumber");
}

//If user is not logged in, don't print the version number information in the footer.
if (empty(Yii::app()->session['loginID']))
{
$data['versionnumber']="";
$data['versiontitle']="";
$data['buildtext']="";
$aData['versionnumber']="";
$aData['versiontitle']="";
$aData['buildtext']="";
}
else
{
$data['versiontitle'] = $clang->gT('Version');
$aData['versiontitle'] = $clang->gT('Version');
}

$data['imageurl'] = Yii::app()->getConfig("imageurl");
$data['url'] = $url;
$aData['imageurl'] = Yii::app()->getConfig("imageurl");
$aData['url'] = $url;

return $this->renderPartial("/admin/super/footer", $data, $return);
return $this->renderPartial("/admin/super/footer", $aData, $return);

}

Expand All @@ -373,12 +366,12 @@ public function _getAdminFooter($url, $explanation, $return = false)
*/
public function _showMessageBox($title,$message,$class="header ui-widget-header")
{
$data['title'] = $title;
$data['message'] = $message;
$data['class'] = $class;
$data['clang'] = $this->lang;
$aData['title'] = $title;
$aData['message'] = $message;
$aData['class'] = $class;
$aData['clang'] = $this->lang;

$this->renderPartial('/admin/super/messagebox', $data);
$this->renderPartial('/admin/super/messagebox', $aData);
}

/**
Expand All @@ -397,36 +390,36 @@ public function _showadminmenu($surveyid = false)
{

$clang = $this->lang;
$data['clang']= $clang;
$aData['clang']= $clang;

if (Yii::app()->session['pw_notify'] && Yii::app()->getConfig("debug")<2) {
Yii::app()->session['flashmessage'] = $clang->gT("Warning: You are still using the default password ('password'). Please change your password and re-login again.");
}

$data['showupdate'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 && getGlobalSetting("updatenotification")!='never' && getGlobalSetting("updateavailable")==1 && Yii::app()->getConfig("updatable") );
if($data['showupdate'])
$aData['showupdate'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 && getGlobalSetting("updatenotification")!='never' && getGlobalSetting("updateavailable")==1 && Yii::app()->getConfig("updatable") );
if($aData['showupdate'])
{
$data['aUpdateVersions'] = json_decode(getGlobalSetting("updateversions"),true);
$aData['aUpdateVersions'] = json_decode(getGlobalSetting("updateversions"),true);
$aUpdateTexts=array();
foreach ($data['aUpdateVersions'] as $aVersion)
foreach ($aData['aUpdateVersions'] as $aVersion)
{
$aUpdateTexts[]=$aVersion['versionnumber'].'('.$aVersion['build'].')';
}
$data['sUpdateText']=implode(' '.$clang->gT('or').' ',$aUpdateTexts);
$aData['sUpdateText']=implode(' '.$clang->gT('or').' ',$aUpdateTexts);
}
$data['surveyid'] = $surveyid;
$data['iconsize'] = Yii::app()->getConfig('adminthemeiconsize');
$data['sImageURL'] = Yii::app()->getConfig('adminimageurl');
$this->renderPartial("/admin/super/adminmenu", $data);
$aData['surveyid'] = $surveyid;
$aData['iconsize'] = Yii::app()->getConfig('adminthemeiconsize');
$aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
$this->renderPartial("/admin/super/adminmenu", $aData);

}

public function _loadEndScripts()
{
static $out = false;
if ($out)
static $bRendered = false;
if ($bRendered)
return true;
$out = true;
$bRendered = true;
if (empty(Yii::app()->session['metaHeader']))
Yii::app()->session['metaHeader'] = '';

Expand Down

0 comments on commit 0becedf

Please sign in to comment.