fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 15:22:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

NOISSUE remove reference operator.

Browse source
This commit is contained in:
bnu 2013-12-30 17:35:02 +09:00
parent 35384999c9
commit 194ce8614a
118 changed files with 859 additions and 859 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/components/poll_maker/poll_maker.class.php
View file

@ -26,7 +26,7 @@ class poll_maker extends EditorHandler
function getPopupContent()
{
// Wanted Skins survey
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
Context::set('skin_list', $skin_list);
// Pre-compiled source code to compile template return to
@ -54,7 +54,7 @@ class poll_maker extends EditorHandler
if(!$width) $width = 400;
$style = sprintf('width:%dpx', $width);
// poll model object creation to come get it return html
$oPollModel = &getModel('poll');
$oPollModel = getModel('poll');
return $oPollModel->getPollHtml($poll_srl, $style, $skin);
}
}

8
modules/editor/editor.admin.controller.php
View file

@ -44,7 +44,7 @@ class editorAdminController extends editor
$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
if(!$output->toBool()) return new Object();
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($site_module_info->site_srl);
$this->setRedirectUrl(Context::get('error_return_url'));
}
@ -130,7 +130,7 @@ class editorAdminController extends editor
else $output = executeQuery('editor.updateSiteComponent', $args);
if(!$output->toBool()) return $output;
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($args->site_srl);
$this->setMessage('success_updated');
@ -142,7 +142,7 @@ class editorAdminController extends editor
*/
function procEditorAdminGeneralConfig()
{
$oModuleController = &getController('module');
$oModuleController = getController('module');
$configVars = Context::getRequestVars();
if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
@ -188,7 +188,7 @@ class editorAdminController extends editor
if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
else $output = executeQuery('editor.insertSiteComponent', $args);
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->removeCache($site_srl);
return $output;
}

12
modules/editor/editor.admin.view.php
View file

@ -25,8 +25,8 @@ class editorAdminView extends editor
$site_srl = (int)$site_module_info->site_srl;
// Get a type of component
$oEditorModel = &getModel('editor');
$oModuleModel = &getModel('module');
$oEditorModel = getModel('editor');
$oModuleModel = getModel('module');
$editor_config = $oModuleModel->getModuleConfig('editor');
if(!$editor_config)
@ -58,7 +58,7 @@ class editorAdminView extends editor
}
// Get install info, update info, count
$oAutoinstallModel = &getModel('autoinstall');
$oAutoinstallModel = getModel('autoinstall');
foreach($component_list as $component_name => $xml_info)
{
$component_count++;
@ -142,15 +142,15 @@ class editorAdminView extends editor
$component_name = Context::get('component_name');
// Get information of the editor component
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$component = $oEditorModel->getComponent($component_name,$site_srl);
Context::set('component', $component);
// Get a group list to set a group
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($site_srl);
Context::set('group_list', $group_list);
// Get a mid list
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$args =new stdClass();
$args->site_srl = $site_srl;

10
modules/editor/editor.class.php
View file

@ -13,9 +13,9 @@ class editor extends ModuleObject
function moduleInstall()
{
// Register action forward (to use in administrator mode)
$oModuleController = &getController('module');
$oModuleController = getController('module');
// Add the default editor component
$oEditorController = &getAdminController('editor');
$oEditorController = getAdminController('editor');
$oEditorController->insertComponent('colorpicker_text',true);
$oEditorController->insertComponent('colorpicker_bg',true);
$oEditorController->insertComponent('emoticon',true);
@ -44,7 +44,7 @@ class editor extends ModuleObject
*/
function checkUpdate()
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$oDB = &DB::getInstance();
// 2009. 06. 15 Save module_srl when auto-saving
@ -72,8 +72,8 @@ class editor extends ModuleObject
*/
function moduleUpdate()
{
$oModuleModel = &getModel('module');
$oModuleController = &getController('module');
$oModuleModel = getModel('module');
$oModuleController = getController('module');
$oDB = &DB::getInstance();
// Save module_srl when auto-saving 15/06/2009

26
modules/editor/editor.controller.php
View file

@ -36,7 +36,7 @@ class editorController extends editor
*/
function procEditorRemoveSavedDoc()
{
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->deleteSavedDoc(true);
}
@ -49,7 +49,7 @@ class editorController extends editor
$method = Context::get('method');
if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
@ -131,7 +131,7 @@ class editorController extends editor
$editor_config->enable_autosave = Context::get('enable_autosave');
if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
$oModuleController = &getController('module');
$oModuleController = getController('module');
for($i=0;$i<count($module_srl);$i++)
{
$srl = trim($module_srl[$i]);
@ -157,7 +157,7 @@ class editorController extends editor
$module_srl = $module_info->module_srl;
if($module_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$editor_config = $oEditorModel->getEditorConfig($module_srl);
$content_style = $editor_config->content_style;
if($content_style)
@ -228,7 +228,7 @@ class editorController extends editor
if(!$xml_obj->attrs->editor_component) return $match[0];
// Get converted codes by using component::transHTML()
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
@ -272,8 +272,8 @@ class editorController extends editor
{
$editor_sequence = Context::get('editor_sequence');
$primary_key = Context::get('primary_key');
$oEditorModel = &getModel('editor');
$oFileController = &getController('file');
$oEditorModel = getModel('editor');
$oFileController = getController('file');
$saved_doc = $oEditorModel->getSavedDoc(null);
@ -323,7 +323,7 @@ class editorController extends editor
$saved_doc = $output->data;
if(!$saved_doc) return;
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
if(!$oSaved->isExists())
{
@ -352,7 +352,7 @@ class editorController extends editor
*/
function makeCache($filter_enabled = true, $site_srl)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$args = new stdClass;
if($filter_enabled) $args->enabled = "Y";
@ -464,7 +464,7 @@ class editorController extends editor
// Pass if configured
if($component_list->{$component_name}) continue;
// Insert data into the DB
$oEditorController = &getAdminController('editor');
$oEditorController = getAdminController('editor');
$oEditorController->insertComponent($component_name, false, $site_srl);
// Add to component_list
unset($xml_info);
@ -486,17 +486,17 @@ class editorController extends editor
*/
function removeCache($site_srl = 0)
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
}
function triggerCopyModule(&$obj)
{
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
$oModuleController = &getController('module');
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))
{
foreach($obj->moduleSrlList AS $key=>$moduleSrl)

16
modules/editor/editor.model.php
View file

@ -26,12 +26,12 @@ class editorModel extends editor
if(!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
{
// Get trackback settings of the selected module
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
}
$editor_config = $GLOBALS['__editor_module_config__'][$module_srl];
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$editor_default_config = $oModuleModel->getModuleConfig('editor');
if(!is_object($editor_config)) $editor_config = new stdClass();
@ -240,7 +240,7 @@ class editorModel extends editor
$files_count = 0;
if($allow_fileupload)
{
$oFileModel = &getModel('file');
$oFileModel = getModel('file');
// Get upload configuration to set on SWFUploader
$file_config = $oFileModel->getUploadConfig();
$file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
@ -251,7 +251,7 @@ class editorModel extends editor
$upload_status = $oFileModel->getUploadStatus();
Context::set('upload_status', $upload_status);
// Upload enabled (internally caching)
$oFileController = &getController('file');
$oFileController = getController('file');
$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
// Check if the file already exists
if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
@ -476,7 +476,7 @@ class editorModel extends editor
// Return null if no result is auto-saved
if(!$saved_doc) return;
// Check if the auto-saved document already exists
$oDocumentModel = &getModel('document');
$oDocumentModel = getModel('document');
$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
if($oSaved->isExists()) return;
// Move all the files if the auto-saved data contains document_srl and file
@ -484,12 +484,12 @@ class editorModel extends editor
if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
{
$saved_doc->module_srl = $auto_save_args->module_srl;
$oFileController = &getController('file');
$oFileController = getController('file');
$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
}
else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
// Change auto-saved data
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->deleteSavedDoc(false);
$oEditorController->doSaveDoc($saved_doc);
@ -554,7 +554,7 @@ class editorModel extends editor
$cache_file = $this->getCacheFile(false, $site_srl);
if($from_db || !file_exists($cache_file))
{
$oEditorController = &getController('editor');
$oEditorController = getController('editor');
$oEditorController->makeCache(false, $site_srl);
}

14
modules/editor/editor.view.php
View file

@ -29,7 +29,7 @@ class editorView extends editor
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
// Get compoenet object
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
if(!$oComponent->toBool())
{
@ -60,7 +60,7 @@ class editorView extends editor
$site_module_info = Context::get('site_module_info');
$site_srl = (int)$site_module_info->site_srl;
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$component = $oEditorModel->getComponent($component_name, $site_srl);
Context::set('component', $component);
@ -85,12 +85,12 @@ class editorView extends editor
if(!$current_module_srl) return new Object();
}
// Get editors settings
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$editor_config = $oEditorModel->getEditorConfig($current_module_srl);
Context::set('editor_config', $editor_config);
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
// Get a list of editor skin
$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
Context::set('editor_skin_list', $editor_skin_list);
@ -111,7 +111,7 @@ class editorView extends editor
}
Context::set('content_style_list', $content_style_list);
// Get a group list
$oMemberModel = &getModel('member');
$oMemberModel = getModel('member');
$site_module_info = Context::get('site_module_info');
$group_list = $oMemberModel->getGroups($site_module_info->site_srl);
Context::set('group_list', $group_list);
@ -141,7 +141,7 @@ class editorView extends editor
function dispEditorSkinColorset()
{
$skin = Context::get('skin');
$oModuleModel = &getModel('module');
$oModuleModel = getModel('module');
$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
$colorset = $skin_info->colorset;
Context::set('colorset', $colorset);
@ -149,7 +149,7 @@ class editorView extends editor
function dispEditorConfigPreview()
{
$oEditorModel = &getModel('editor');
$oEditorModel = getModel('editor');
$config = $oEditorModel->getEditorConfig();
$mode = Context::get('mode');