OSDN Git Service

CHANGE: Adminクラスのスキン関係メソッドの整理・統合
[nucleus-jp/nucleus-next.git] / nucleus / libs / ADMIN.php
index c3f216d..839a8db 100644 (file)
@@ -160,7 +160,7 @@ class Admin
                if (isset($member) && $member->isLoggedIn())\r
                {\r
                        $memskin = $member->getAdminSkin();\r
-                       if ( $memskin )\r
+                       if ( $memskin && Skin::existsID($memskin))\r
                        {\r
                                $skinid = $memskin;\r
                        }\r
@@ -229,6 +229,7 @@ class Admin
                        if (!$manager->checkTicket())\r
                        {\r
                                self::error(_ERROR_BADTICKET);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -246,6 +247,7 @@ class Admin
                else if ( self::existsSkinContents('adminerrorpage') )\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
                elseif ( $id != $CONF['AdminSkin'] )\r
                {\r
@@ -253,13 +255,15 @@ class Admin
                        if ( self::$skin && self::existsSkinContents('adminerrorpage') )\r
                        {\r
                                self::error(_BADACTION . ENTITY::hsc($action));\r
+                               return;\r
                        }\r
                }\r
                else\r
                {\r
                        self::error(_BADACTION . ENTITY::hsc($action));\r
+                       return;\r
                }\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -335,7 +339,7 @@ class Admin
                if ( $member->isLoggedIn() && $member->canLogin() )\r
                {\r
                        self::action_overview();\r
-                       exit;\r
+                       return;\r
                }\r
                \r
                /* TODO: needless variable??? */\r
@@ -425,6 +429,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog/category chosen, show choice now\r
@@ -463,6 +468,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -506,6 +512,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -538,6 +545,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On delete: check if confirmation has been given\r
@@ -568,6 +576,7 @@ class Admin
                if ( !is_array($selected) || sizeof($selected) == 0 )\r
                {\r
                        self::error(_BATCH_NOSELECTION);\r
+                       return;\r
                }\r
                \r
                // On move: when no destination blog chosen, show choice now\r
@@ -997,6 +1006,7 @@ class Admin
                if ( !$manager->existsItem($itemid,1,1) )\r
                {\r
                        self::error(_ERROR_NOSUCHITEM);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('itemdelete');\r
@@ -1199,6 +1209,7 @@ class Admin
                if ( $result['status'] == 'error' )\r
                {\r
                        self::error($result['message']);\r
+                       return;\r
                }\r
                \r
                $item =& $manager->getItem($result['itemid'], 0, 0);\r
@@ -1261,17 +1272,20 @@ class Admin
                if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)\r
                {\r
                        self::error(_ERROR_COMMENT_LONGWORD);\r
+                       return;\r
                }\r
                \r
                // check length\r
                if ( i18n::strlen($body) < 3 )\r
                {\r
                        self::error(_ERROR_COMMENT_NOCOMMENT);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen($body) > 5000 )\r
                {\r
                        self::error(_ERROR_COMMENT_TOOLONG);\r
+                       return;\r
                }\r
                \r
                // prepare body\r
@@ -1495,21 +1509,25 @@ class Admin
                        if ( !isValidDisplayName($name) )\r
                        {\r
                                self::error(_ERROR_BADNAME);\r
+                               return;\r
                        }\r
                        \r
                        if ( ($name != $mem->getDisplayName()) && Member::exists($name) )\r
                        {\r
                                self::error(_ERROR_NICKNAMEINUSE);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password != $repeatpassword )\r
                        {\r
                                self::error(_ERROR_PASSWORDMISMATCH);\r
+                               return;\r
                        }\r
                        \r
                        if ( $password && (i18n::strlen($password) < 6) )\r
                        {\r
                                self::error(_ERROR_PASSWORDTOOSHORT);\r
+                               return;\r
                        }\r
                                \r
                        if ( $password )\r
@@ -1527,6 +1545,7 @@ class Admin
                                if ( !$pwdvalid )\r
                                {\r
                                        self::error($pwderror);\r
+                                       return;\r
                                }\r
                        }\r
                }\r
@@ -1534,14 +1553,17 @@ class Admin
                if ( !NOTIFICATION::address_validation($email) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                if ( !$realname )\r
                {\r
                        self::error(_ERROR_REALNAMEMISSING);\r
+                       return;\r
                }\r
                if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )\r
                {\r
                        self::error(_ERROR_NOSUCHTRANSLATION);\r
+                       return;\r
                }\r
                \r
                // check if there will remain at least one site member with both the logon and admin rights\r
@@ -1554,6 +1576,7 @@ class Admin
                        if ( $r->rowCount() < 2 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -1645,11 +1668,13 @@ class Admin
                if ( postVar('password') != postVar('repeatpassword') )\r
                {\r
                        self::error(_ERROR_PASSWORDMISMATCH);\r
+                       return;\r
                }\r
                \r
                if ( i18n::strlen(postVar('password')) < 6 )\r
                {\r
                        self::error(_ERROR_PASSWORDTOOSHORT);\r
+                       return;\r
                }\r
                \r
                $res = Member::create(\r
@@ -1666,6 +1691,7 @@ class Admin
                if ( $res != 1 )\r
                {\r
                        self::error($res);\r
+                       return;\r
                }\r
                \r
                // fire PostRegister event\r
@@ -1725,6 +1751,7 @@ class Admin
                if ( !$info )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                $mem =& $manager->getMember($info->vmember);\r
@@ -1732,6 +1759,7 @@ class Admin
                if ( !$mem )\r
                {\r
                        self::error(_ERROR_ACTIVATE);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should consider to use the other way insterad of this */\r
@@ -1869,6 +1897,7 @@ class Admin
                if ( !$blog->addTeamMember($memberid, $admin) )\r
                {\r
                        self::error(_ERROR_ALREADYONTEAM);\r
+                       return;\r
                }\r
                \r
                self::action_manageteam();\r
@@ -1915,6 +1944,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                self::action_manageteam();\r
                return;\r
@@ -2003,6 +2033,7 @@ class Admin
                        if ( $r->rowCount() == 1 )\r
                        {\r
                                self::error(_ERROR_ATLEASTONEBLOGADMIN);\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -2074,6 +2105,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";\r
@@ -2082,6 +2114,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $blog           =& $manager->getBlog($blogid);\r
@@ -2151,6 +2184,7 @@ class Admin
                if ( !isValidCategoryName($cname) )\r
                {\r
                        self::error(_ERROR_BADCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query  = "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";\r
@@ -2159,6 +2193,7 @@ class Admin
                if ( $res->rowCount() > 0 )\r
                {\r
                        self::error(_ERROR_DUPCATEGORYNAME);\r
+                       return;\r
                }\r
                \r
                $query =  "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";\r
@@ -2177,12 +2212,11 @@ class Admin
                if ( $desturl )\r
                {\r
                        redirect($desturl);\r
-                       exit;\r
-               }\r
-               else\r
-               {\r
-                       self::action_blogsettings();\r
+                       return;\r
                }\r
+               \r
+               self::action_blogsettings();\r
+               \r
                return;\r
        }\r
        \r
@@ -2207,12 +2241,14 @@ class Admin
                if ( !$blog->isValidCategory($catid) )\r
                {\r
                        self::error(_ERROR_NOSUCHCATEGORY);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default category\r
                if ( $blog->getDefaultCategory() == $catid )\r
                {\r
                        self::error(_ERROR_DELETEDEFCATEGORY);\r
+                       return;\r
                }\r
                \r
                // check if catid is the only category left for blogid\r
@@ -2222,6 +2258,7 @@ class Admin
                if ( $res->rowCount() == 1 )\r
                {\r
                        self::error(_ERROR_DELETELASTCATEGORY);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('categorydelete');\r
@@ -2247,6 +2284,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::action_blogsettings();\r
@@ -2452,21 +2490,25 @@ class Admin
                if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )\r
                {\r
                        self::error(_ERROR_BADNOTIFY);\r
+                       return;\r
                }\r
                \r
                if ( !isValidShortName($shortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                // check if update file is writable\r
                if ( $updatefile && !is_writeable($updatefile) )\r
                {\r
                        self::error(_ERROR_UPDATEFILE);\r
+                       return;\r
                }\r
                \r
                $blog->setName(trim(postVar('name')));\r
@@ -2521,6 +2563,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                $blog =& $manager->getBlog($blogid);\r
@@ -2551,6 +2594,7 @@ class Admin
                if ( $CONF['DefaultBlog'] == $blogid )\r
                {\r
                        self::error(_ERROR_DELDEFBLOG);\r
+                       return;\r
                }\r
                \r
                // delete all comments\r
@@ -2625,15 +2669,18 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                if ( $member->isAdmin() )\r
                {\r
                        self::action_usermanagement();\r
+                       return;\r
                }\r
                else\r
                {\r
                        self::action_overview(_DELETED_MEMBER);\r
+                       return;\r
                }\r
                return;\r
        }\r
@@ -2726,11 +2773,13 @@ class Admin
                if ( !isValidShortName($bshortname) )\r
                {\r
                        self::error(_ERROR_BADSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                if ( $manager->existsBlog($bshortname) )\r
                {\r
                        self::error(_ERROR_DUPSHORTBLOGNAME);\r
+                       return;\r
                }\r
                \r
                $data = array(\r
@@ -2856,57 +2905,18 @@ class Admin
         */\r
        static private function action_skinieimport()\r
        {\r
-               global $member, $DIR_LIBS, $DIR_SKINS, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
-               $importer = new SkinImport();\r
-               \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-                       \r
-                       /* TODO: remove this\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
-                       }\r
-                        */\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);\r
-               \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
-               \r
-               // clashes\r
-               $skinNameClashes                = $importer->checkSkinNameClashes();\r
-               $templateNameClashes    = $importer->checkTemplateNameClashes();\r
-               $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
-               \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skinclashes'] = $skinNameClashes;\r
-               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
-               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
                \r
+               $error = self::skinieimport($mode, $skinFileRaw);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinieimport');\r
@@ -2928,54 +2938,21 @@ class Admin
                // load skinie class\r
                include_once($DIR_LIBS . 'skinie.php');\r
                \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
+               $mode = postVar('mode');\r
+               $skinFileRaw = postVar('skinfile');\r
                $allowOverwrite = intPostVar('overwrite');\r
                \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
-                       \r
-                       /* TODO: remove this\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';\r
-                       }\r
-                       */\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               $importer = new SkinImport();\r
-               \r
-               $error = $importer->readFile($skinFile);\r
-               \r
-               if ( $error )\r
-               {\r
-                       self::error($error);\r
-               }\r
-               \r
-               $error = $importer->writeToDatabase($allowOverwrite);\r
-               \r
+               $error = self::skinieedoimport($mode, $skinFileRaw, $allowOverwrite);\r
                if ( $error )\r
                {\r
-                       self::error($error);\r
+                       self::error($msg);\r
+                       return;\r
                }\r
                \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']  = $importer->getInfo();\r
-               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
-               \r
                self::$skin->parse('skiniedoimport');\r
                return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_skinieexport()\r
         * \r
@@ -2984,42 +2961,16 @@ class Admin
         */\r
        static private function action_skinieexport()\r
        {\r
-               global $member, $DIR_LIBS;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $aSkins         = requestIntArray('skin');\r
-               $aTemplates     = requestIntArray('template');\r
-               \r
-               if ( !is_array($aTemplates) )\r
-               {\r
-                       $aTemplates = array();\r
-               }\r
-               if ( !is_array($aSkins) )\r
-               {\r
-                       $aSkins = array();\r
-               }\r
-               \r
-               $skinList               = array_keys($aSkins);\r
-               $templateList   = array_keys($aTemplates);\r
-               \r
+               $aSkins = requestIntArray('skin');\r
+               $aTemplates = requestIntArray('template');\r
                $info = postVar('info');\r
                \r
-               $exporter = new SkinExport();\r
-               foreach ( $skinList as $skinId )\r
-               {\r
-                       $exporter->addSkin($skinId);\r
-               }\r
-               foreach ($templateList as $templateId)\r
-               {\r
-                       $exporter->addTemplate($templateId);\r
-               }\r
-               $exporter->setInfo($info);\r
+               self::skinieexport($aSkins, $aTemplates, $info);\r
                \r
-               $exporter->export();\r
                return;\r
        }\r
        \r
@@ -3084,11 +3035,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3247,11 +3200,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3362,11 +3317,13 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                // 1. Remove all template parts\r
@@ -3592,14 +3549,17 @@ class Admin
                if ( !isValidTemplateName($name) )\r
                {\r
                        self::error(_ERROR_BADTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINTEMPLATENAME);\r
+                       return;\r
                }\r
                else if ( Template::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPTEMPLATENAME);\r
+                       return;\r
                }\r
                \r
                $newTemplateId = Template::createNew($name, $desc);\r
@@ -3688,14 +3648,15 @@ class Admin
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
-               \r
-               if ( SKIN::exists($name) )\r
+               else if ( SKIN::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
                \r
-               $newId = SKIN::createNew($name, $desc);\r
+               SKIN::createNew($name, $desc);\r
                \r
                self::action_skinoverview();\r
                return;\r
@@ -3709,7 +3670,7 @@ class Admin
         */\r
        static private function action_skinedit()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -3725,50 +3686,26 @@ class Admin
         */\r
        static private function action_skineditgeneral()\r
        {\r
-               global $manager, $member;\r
+               global $member;\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $name           = postVar('name');\r
-               $desc           = postVar('desc');\r
-               $type           = postVar('type');\r
-               $inc_mode       = postVar('inc_mode');\r
-               $inc_prefix     = postVar('inc_prefix');\r
-               \r
-               $skin =& $manager->getSkin($skinid);\r
-               \r
-               // 1. Some checks\r
-               if ( !isValidSkinName($name) )\r
-               {\r
-                       self::error(_ERROR_BADSKINNAME);\r
-               }\r
-               \r
-               if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
-               {\r
-                       self::error(_ERROR_DUPSKINNAME);\r
-               }\r
-               \r
-               if ( !$type )\r
-               {\r
-                       $type = 'text/html';\r
-               }\r
-               if ( !$inc_mode )\r
+               $error = self::skineditgeneral($skinid);\r
+               if ( $error )\r
                {\r
-                       $inc_mode = 'normal';\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               // 2. Update description\r
-               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
-               \r
                self::action_skinedit();\r
                return;\r
        }\r
        \r
        static private function action_skinedittype($msg = '')\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -3777,14 +3714,14 @@ class Admin
                        self::$headMess = $msg;\r
                }\r
                \r
-               $skinid = intRequestVar('skinid');\r
-               $type   = requestVar('type');\r
-               $type   = trim($type);\r
-               $type   = strtolower($type);\r
+               $type = requestVar('type');\r
+               $type = trim($type);\r
+               $type = strtolower($type);\r
                \r
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinedittype');\r
@@ -3822,16 +3759,17 @@ class Admin
         */\r
        static private function action_skindelete()\r
        {\r
-               global $manager, $member, $CONF;\r
-               \r
-               $skinid = intRequestVar('skinid');\r
+               global $CONF, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
+               $skinid = intRequestVar('skinid');\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3842,6 +3780,7 @@ class Admin
                if ( $name )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skindelete');\r
@@ -3856,16 +3795,17 @@ class Admin
         */\r
        static private function action_skindeleteconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
-               \r
-               $skinid = intRequestVar('skinid');\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
+               $skinid = intRequestVar('skinid');\r
+               \r
                // don't allow default skin to be deleted\r
                if ( $skinid == $CONF['BaseSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
                }\r
                \r
                // don't allow deletion of default skins for blogs\r
@@ -3876,23 +3816,10 @@ class Admin
                if ( $name )\r
                                {\r
                        self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));\r
+                       return;\r
                }\r
                \r
-               $data = array('skinid' => $skinid);\r
-               $manager->notify('PreDeleteSkin', $data);\r
-               \r
-               // 1. delete description\r
-               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
-               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
-               DB::execute($query);\r
-               \r
-               // 2. delete parts\r
-               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
-               DB::execute($query);\r
-               \r
-               $data = array('skinid' => $skinid);\r
-               $manager->notify('PostDeleteSkin', $data);\r
+               self::skindeleteconfirm($skinid);\r
                \r
                self::action_skinoverview();\r
                return;\r
@@ -3906,7 +3833,7 @@ class Admin
         */\r
        static private function action_skinremovetype()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -3916,13 +3843,7 @@ class Admin
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
-               }\r
-               \r
-               // don't allow default skinparts to be deleted\r
-               /* TODO: this array should be retrieved from Action class */\r
-               if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
-               {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('skinremovetype');\r
@@ -3937,45 +3858,24 @@ class Admin
         */\r
        static private function action_skinremovetypeconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                $skintype = requestVar('type');\r
                \r
-               if ( !isValidShortName($skintype) )\r
-               {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
-               }\r
-               \r
-               // don't allow default skinparts to be deleted\r
-               /* TODO: this array should be retrieved from Action class */\r
-               if ( in_array($skintype, array('index', 'item', 'archivelist', 'archive', 'search', 'error', 'member', 'imagepopup')) )\r
+               $error = self::skinremovetypeconfirm($skinid, $skintype);\r
+               if ( $error )\r
                {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               $data = array(\r
-                       'skinid'   => $skinid,\r
-                       'skintype' => $skintype\r
-               );\r
-               $manager->notify('PreDeleteSkinPart', $data);\r
-               // delete part\r
-               $query = "DELETE FROM %s WHERE sdesc=%d AND stype=%s;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
-               DB::execute($query);\r
-               \r
-               $data = array(\r
-                       'skinid'   => $skinid,\r
-                       'skintype' => $skintype\r
-               );\r
-               $manager->notify('PostDeleteSkinPart', $data);\r
-               \r
                self::action_skinedit();\r
                return;\r
        }\r
-\r
+       \r
        /**\r
         * Admin::action_skinclone()\r
         * \r
@@ -3984,74 +3884,19 @@ class Admin
         */\r
        static private function action_skinclone()\r
        {\r
-               global $manager, $member;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
-               // 1. read skin to clone\r
-               $skin =& $manager->getSkin($skinid);\r
-               \r
-               $name = "{$skin->getName()}_clone";\r
-               \r
-               // if a skin with that name already exists:\r
-               if ( Skin::exists($name) )\r
-               {\r
-                       $i = 1;\r
-                       while ( Skin::exists($name . $i) )\r
-                       {\r
-                               $i++;\r
-                       }\r
-                       $name .= $i;\r
-               }\r
-               \r
-               // 2. create skin desc\r
-               $newid = Skin::createNew(\r
-                       $name,\r
-                       $skin->getDescription(),\r
-                       $skin->getContentType(),\r
-                       $skin->getIncludeMode(),\r
-                       $skin->getIncludePrefix()\r
-               );\r
-               \r
-               // 3. clone\r
-               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
-               \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
-               {\r
-                       self::skinclonetype($skin, $newid, $row['stype']);\r
-               }\r
+               self::skinclone($skinid);\r
                \r
                self::action_skinoverview();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::skinclonetype()\r
-        * \r
-        * @param       String  $skin   Skin object\r
-        * @param       Integer $newid  ID for this clone\r
-        * @param       String  $type   type of skin\r
-        * @return      Void\r
-        */\r
-       static private function skinclonetype($skin, $newid, $type)\r
-       {\r
-               $newid = intval($newid);\r
-               $content = $skin->getContentFromDB($type);\r
-               \r
-               if ( $content )\r
-               {\r
-                       $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
-                       $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
-                       DB::execute($query);\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_adminskinoverview()\r
         * \r
         * @param       void\r
@@ -4059,7 +3904,7 @@ class Admin
         */\r
        static private function action_adminskinoverview()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -4076,24 +3921,30 @@ class Admin
        static private function action_adminskinnew()\r
        {\r
                global $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
+               \r
                $name = trim(postVar('name'));\r
                $desc = trim(postVar('desc'));\r
                \r
                if ( !isValidSkinName($name) )\r
                {\r
                        self::error(_ERROR_BADSKINNAME);\r
+                       return;\r
                }\r
                else if ( !preg_match('#^admin/#', $name) )\r
                {\r
                        self::error(_ERROR_BADADMINSKINNAME);\r
+                       return;\r
                }\r
                else if ( Skin::exists($name) )\r
                {\r
                        self::error(_ERROR_DUPSKINNAME);\r
+                       return;\r
                }\r
-               /* TODO: $newId is not reused... */\r
-               $newId = Skin::createNew($name, $desc);\r
+               \r
+               Skin::createNew($name, $desc);\r
+               \r
                self::action_adminskinoverview();\r
                return;\r
        }\r
@@ -4106,10 +3957,12 @@ class Admin
         */\r
        static private function action_adminskinedit()\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
+               \r
                self::$skin->parse('adminskinedit');\r
+               \r
                return;\r
        }\r
        \r
@@ -4121,39 +3974,19 @@ class Admin
         */\r
        static private function action_adminskineditgeneral()\r
        {\r
-               global $manager, $member;\r
+               global $member;\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $name           = postVar('name');\r
-               $desc           = postVar('desc');\r
-               $type           = postVar('type');\r
-               $inc_mode       = postVar('inc_mode');\r
-               $inc_prefix     = postVar('inc_prefix');\r
-               \r
-               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
-               \r
-               // 1. Some checks\r
-               if ( !isValidSkinName($name) )\r
-               {\r
-                       self::error(_ERROR_BADSKINNAME);\r
-               }\r
-               if ( ($skin->getName() != $name) && Skin::exists($name) )\r
-               {\r
-                       self::error(_ERROR_DUPSKINNAME);\r
-               }\r
-               if ( !$type )\r
-               {\r
-                       $type = 'text/html';\r
-               }\r
-               if ( !$inc_mode )\r
+               $error = self::skineditgeneral($skinid, 'AdminActions');\r
+               if ( $error )\r
                {\r
-                       $inc_mode = 'normal';\r
+                       self::error($error);\r
+                       return;\r
                }\r
-               // 2. Update description\r
-               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
+               \r
                self::action_adminskinedit();\r
                return;\r
        }\r
@@ -4166,7 +3999,7 @@ class Admin
         */\r
        static private function action_adminskinedittype($msg = '')\r
        {\r
-               global $member, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
@@ -4181,6 +4014,7 @@ class Admin
                if ( !isValidShortName($type) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('adminskinedittype');\r
@@ -4205,6 +4039,7 @@ class Admin
                \r
                $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
                $skin->update($type, $content);\r
+               \r
                self::action_adminskinedittype(_SKIN_UPDATED);\r
                return;\r
        }\r
@@ -4217,11 +4052,33 @@ class Admin
         */\r
        static private function action_adminskindelete()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $CONF, $member;\r
+               \r
                $member->isAdmin() or self::disallow();\r
                \r
-               /* TODO: needless variable $skinid... */\r
                $skinid = intRequestVar('skinid');\r
+               \r
+               // don't allow default skin to be deleted\r
+               if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )\r
+               {\r
+                       self::error(_ERROR_DEFAULTSKIN);\r
+                       return;\r
+               }\r
+               \r
+               /* don't allow if someone use it as a default*/\r
+               $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';\r
+               $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
+               \r
+               $members = array();\r
+               while ( $row = $res->fetch() ) {\r
+                       $members[] = $row['mrealname'];\r
+               }\r
+               if ( count($members) )\r
+               {\r
+                       self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
+                       return;\r
+               }\r
+               \r
                self::$skin->parse('adminskindelete');\r
                return;\r
        }\r
@@ -4234,48 +4091,35 @@ class Admin
         */\r
        static private function action_adminskindeleteconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member, $CONF;\r
                \r
                $member->isAdmin() or self::disallow();\r
+               \r
                $skinid = intRequestVar('skinid');\r
                \r
                // don't allow default skin to be deleted\r
-               if ( $skinid == $CONF['AdminSkin'] )\r
+               if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )\r
                {\r
                        self::error(_ERROR_DEFAULTSKIN);\r
-                       exit;\r
+                       return;\r
                }\r
                \r
-               /*\r
-                * TODO: NOT Implemented\r
-                *  don't allow deletion of default skins for members\r
-                */\r
-               $query          = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d';\r
-               $res            = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
-               $members        = array();\r
+               /* don't allow if someone use it as a default*/\r
+               $query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';\r
+               $res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));\r
+               \r
+               $members = array();\r
                while ( $row = $res->fetch() ) {\r
                        $members[] = $row['mrealname'];\r
                }\r
                if ( count($members) )\r
                {\r
                        self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));\r
-                       exit;\r
+                       return;\r
                }\r
-\r
-               $manager->notify('PreDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
-               \r
-               // 1. delete description\r
-               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
-               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
-               DB::execute($query);\r
-               \r
-               // 2. delete parts\r
-               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
                \r
-               DB::execute($query);\r
+               self::skindeleteconfirm($skinid);\r
                \r
-               $manager->notify('PostDeleteAdminSkin', array('skinid' => (integer) $skinid));\r
                self::action_adminskinoverview();\r
                return;\r
        }\r
@@ -4288,16 +4132,17 @@ class Admin
         */\r
        static private function action_adminskinremovetype()\r
        {\r
-               global $member, $manager, $CONF;\r
+               global $member, $CONF;\r
 \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skinid         = intRequestVar('skinid');\r
-               $skintype       = requestVar('type');\r
+               $skinid = intRequestVar('skinid');\r
+               $skintype = requestVar('type');\r
                \r
                if ( !isValidShortName($skintype) )\r
                {\r
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('adminskinremovetype');\r
@@ -4312,35 +4157,20 @@ class Admin
         */\r
        static private function action_adminskinremovetypeconfirm()\r
        {\r
-               global $member, $CONF, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               $skinid         = intRequestVar('skinid');\r
-               $skintype       = requestVar('type');\r
+               $skinid = intRequestVar('skinid');\r
+               $skintype = requestVar('type');\r
                \r
-               if ( !isValidShortName($skintype) )\r
+               $error = self::skinremovetypeconfirm($skinid, $skintype);\r
+               if ( $error )\r
                {\r
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);\r
+                       self::error($error);\r
+                       return;\r
                }\r
                \r
-               $data =array(\r
-                       'skinid'        => $skinid,\r
-                       'skintype'      => $skintype\r
-               );\r
-               $manager->notify('PreDeleteAdminSkinPart', $data);\r
-\r
-               // delete part\r
-               $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s ;';\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
-               DB::execute($query);\r
-               \r
-               $data = array(\r
-                       'skinid'        => $skinid,\r
-                       'skintype'      => $skintype\r
-               );\r
-               $manager->notify('PostDeleteAdminSkinPart', $data);\r
-               \r
                self::action_adminskinedit();\r
                return;\r
        }\r
@@ -4353,71 +4183,19 @@ class Admin
         */\r
        static private function action_adminskinclone()\r
        {\r
-               global $manager, $member;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                $skinid = intRequestVar('skinid');\r
                \r
-               // 1. read skin to clone\r
-               $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');\r
-               $name = "{$skin->getName()}_clone";\r
-               \r
-               // if a skin with that name already exists:\r
-               if ( Skin::exists($name) )\r
-               {\r
-                       $i = 1;\r
-                       while ( Skin::exists($name . $i) )\r
-                       {\r
-                               $i++;\r
-                       }\r
-                       $name .= $i;\r
-               }\r
-               \r
-               // 2. create skin desc\r
-               $newid = Skin::createNew(\r
-                       $name,\r
-                       $skin->getDescription(),\r
-                       $skin->getContentType(),\r
-                       $skin->getIncludeMode(),\r
-                       $skin->getIncludePrefix()\r
-               );\r
-               \r
-               // 3. clone\r
-               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
-               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               self::skinclone($skinid, 'AdminActions');\r
                \r
-               $res = DB::getResult($query);\r
-               foreach ( $res as $row )\r
-               {\r
-                       self::skinclonetype($skin, $newid, $row['stype']);\r
-               }\r
                self::action_adminskinoverview();\r
                return;\r
        }\r
        \r
        /**\r
-        * Admin::adminskinclonetype()\r
-        * \r
-        * @param       string  $skin   an instance of Skin class\r
-        * @param       integer $newid  ID for new skin\r
-        * @param       string  $type   skin type\r
-        * @return      void\r
-        */\r
-       static private function adminskinclonetype($skin, $newid, $type)\r
-       {\r
-               $content = $skin->getContentFromDB($type);\r
-               \r
-               if ( $content )\r
-               {\r
-                       $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
-                       $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
-                       DB::execute($query);\r
-               }\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_adminskinieoverview()\r
         * \r
         * @param       void\r
@@ -4425,19 +4203,15 @@ class Admin
         */\r
        static private function action_adminskinieoverview()\r
        {\r
-               global $member, $DIR_LIBS, $manager;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
                self::$skin->parse('adminskinieoverview');\r
                return;\r
        }\r
 \r
        /**\r
-        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskinieimport()\r
         * \r
         * @param       void\r
@@ -4445,55 +4219,20 @@ class Admin
         */\r
        static private function action_adminskinieimport()\r
        {\r
-               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               \r
-               $importer = new SKINIMPORT();\r
-               \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
-                       \r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
                \r
-               // read only metadata\r
-               $error = $importer->readFile($skinFile, 1);\r
+               $error = self::skinieimport($mode, $skinFileRaw);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
-               \r
-               // clashes\r
-               $skinNameClashes                        = $importer->checkSkinNameClashes();\r
-               $templateNameClashes            = $importer->checkTemplateNameClashes();\r
-               $hasNameClashes                         = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['skinclashes']        = $skinNameClashes;\r
-               $_REQUEST['tpltclashes']        = $templateNameClashes;\r
-               $_REQUEST['nameclashes']        = $hasNameClashes ? 1 : 0;\r
-\r
                if ( !is_object(self::$skin) )\r
                {\r
                        self::action_adminskiniedoimport();\r
@@ -4506,7 +4245,6 @@ class Admin
        }\r
        \r
        /**\r
-        * FIXME: DUPLICATION, NO NEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEED!!!!!!\r
         * Admin::action_adminskiniedoimport()\r
         * \r
         * @param       void\r
@@ -4514,52 +4252,22 @@ class Admin
         */\r
        static private function action_adminskiniedoimport()\r
        {\r
-               global $DIR_LIBS, $DIR_SKINS, $manager, $member;\r
+               global $DIR_SKINS, $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
-               // load skinie class\r
-               include_once($DIR_LIBS . 'skinie.php');\r
-               \r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
+               $mode = postVar('mode');\r
+               $skinFileRaw = postVar('skinfile');\r
                $allowOverwrite = intPostVar('overwrite');\r
                \r
-               // get full filename\r
-               if ( $mode == 'file' )\r
-               {\r
-                       $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skinbackup.xml";\r
-                       // backwards compatibilty (in v2.0, exports were saved as skindata.xml)\r
-                       if ( !file_exists($skinFile) )\r
-                       {\r
-                               $skinFile = "{$DIR_SKINS}admin/{$skinFileRaw}/skindata.xml";\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       $skinFile = $skinFileRaw;\r
-               }\r
-               \r
-               $importer = new SKINIMPORT();\r
-               \r
-               $error = $importer->readFile($skinFile);\r
+               $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
-               $error = $importer->writeToDatabase($allowOverwrite);\r
-               if ( $error )\r
-               {\r
-                       self::error($error);\r
-               }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
-               \r
-               if ( !is_object(self::$skin) )\r
+               if ( !is_object(self::$skin) )\r
                {\r
                        global $DIR_SKINS;\r
                        $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'";\r
@@ -4568,7 +4276,7 @@ class Admin
                        $query  = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";\r
                        $query  = sprintf($query, sql_table('config'), $res);\r
                        DB::execute($query);\r
-                       $skin   =& $manager->Skin(0, 'AdminActions', 'AdminSkin');\r
+                       $skin   = new Skin(0, 'AdminActions', 'AdminSkin');\r
                        $skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');\r
                }\r
                else\r
@@ -4586,38 +4294,17 @@ class Admin
         */\r
        static private function action_adminskinieexport()\r
        {\r
-               global $member, $DIR_PLUGINS;\r
+               global $member;\r
                \r
                $member->isAdmin() or self::disallow();\r
                \r
                // load skinie class\r
                $aSkins = requestIntArray('skin');\r
-               if (!is_array($aSkins)) {\r
-                       $aSkins = array();\r
-               }\r
-               $skinList = array_keys($aSkins);\r
-               \r
                $aTemplates = requestIntArray('template');\r
-               if (!is_array($aTemplates))\r
-               {\r
-                       $aTemplates = array();\r
-               }\r
-               $templateList = array_keys($aTemplates);\r
-               \r
                $info = postVar('info');\r
                \r
-               include_libs('skinie.php');\r
-               $exporter = new SkinExport();\r
-               foreach ( $skinList as $skinId )\r
-               {\r
-                       $exporter->addSkin($skinId);\r
-               }\r
-               foreach ( $templateList as $templateId )\r
-               {\r
-                       $exporter->addTemplate($templateId);\r
-               }\r
-               $exporter->setInfo($info);\r
-               $exporter->export();\r
+               self::skinieexport($aSkins, $aTemplates, $info);\r
+               \r
                return;\r
        }\r
        \r
@@ -4654,6 +4341,7 @@ class Admin
                if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )\r
                {\r
                        self::error(_ERROR_BADMAILADDRESS);\r
+                       return;\r
                }\r
                \r
                // save settings\r
@@ -4885,6 +4573,7 @@ class Admin
                if ( sizeof($deleted) == 0 )\r
                {\r
                        self::error(_ERROR_DELETEBAN);\r
+                       return;\r
                }\r
                \r
                /* TODO: we should use other ways */\r
@@ -4966,6 +4655,7 @@ class Admin
                        if ( !Ban::addBan($blogid, $iprange, $reason) )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                else\r
@@ -4983,6 +4673,7 @@ class Admin
                        if ( $failed )\r
                        {\r
                                self::error(_ERROR_ADDBAN);\r
+                               return;\r
                        }\r
                }\r
                self::action_banlist();\r
@@ -5047,7 +4738,7 @@ class Admin
                @set_time_limit(1200);\r
                \r
                Backup::do_backup($useGzip);\r
-               exit;\r
+               return;\r
        }\r
        \r
        /**\r
@@ -5066,6 +4757,7 @@ class Admin
                if ( intPostVar('letsgo') != 1 )\r
                {\r
                        self::error(_ERROR_BACKUP_NOTSURE);\r
+                       return;\r
                }\r
                \r
                include($DIR_LIBS . 'backup.php');\r
@@ -5078,6 +4770,7 @@ class Admin
                if ( $message != '' )\r
                {\r
                        self::error($message);\r
+                       return;\r
                }\r
                self::$skin->parse('backuprestore');\r
                return;\r
@@ -5120,6 +4813,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('pluginhelp');\r
@@ -5145,11 +4839,13 @@ class Admin
                if ( $manager->pluginInstalled($name) )\r
                {\r
                        self::error(_ERROR_DUPPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( !checkPlugin($name) )\r
                {\r
                        self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');\r
+                       return;\r
                }\r
                \r
                // get number of currently installed plugins\r
@@ -5183,6 +4879,7 @@ class Admin
                        \r
                        $manager->clearCachedInfo('installedPlugins');\r
                        self::error(_ERROR_PLUGIN_LOAD);\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5193,6 +4890,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));\r
+                       return;\r
                }\r
                \r
                // check if plugin needs a newer Nucleus version\r
@@ -5203,6 +4901,7 @@ class Admin
                        \r
                        // ...and show error\r
                        self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );\r
+                       return;\r
                }\r
                \r
                $pluginList = $plugin->getPluginDep();\r
@@ -5214,6 +4913,7 @@ class Admin
                                // uninstall plugin again...\r
                                self::deleteOnePlugin($plugin->getID());\r
                                self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));\r
+                               return;\r
                        }\r
                }\r
                \r
@@ -5284,6 +4984,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                self::$skin->parse('plugindelete');\r
@@ -5309,6 +5010,7 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                redirect($CONF['AdminURL'] . '?action=pluginlist');\r
@@ -5418,6 +5120,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5453,6 +5156,7 @@ class Admin
                if ( !$manager->pidInstalled($plugid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                // 1. get old order number\r
@@ -5495,6 +5199,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                if ( isset($message) )\r
@@ -5530,6 +5235,7 @@ class Admin
                if ( !$manager->pidInstalled($pid) )\r
                {\r
                        self::error(_ERROR_NOSUCHPLUGIN);\r
+                       return;\r
                }\r
                \r
                $aOptions = requestArray('plugoption');\r
@@ -5546,6 +5252,327 @@ class Admin
        }\r
        \r
        /**\r
+        * Admin::skineditgeneral()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skineditgeneral($skinid, $handler='')\r
+       {\r
+               $name = postVar('name');\r
+               $desc = postVar('desc');\r
+               $type = postVar('type');\r
+               $inc_mode = postVar('inc_mode');\r
+               $inc_prefix = postVar('inc_prefix');\r
+               \r
+               $skin =& $manager->getSkin($skinid, $handler);\r
+               \r
+               // 1. Some checks\r
+               if ( !isValidSkinName($name) )\r
+               {\r
+                       return _ERROR_BADSKINNAME;\r
+               }\r
+               \r
+               if ( ($skin->getName() != $name) && SKIN::exists($name) )\r
+               {\r
+                       return _ERROR_DUPSKINNAME;\r
+               }\r
+               \r
+               if ( !$type )\r
+               {\r
+                       $type = 'text/html';\r
+               }\r
+               \r
+               if ( !$inc_mode )\r
+               {\r
+                       $inc_mode = 'normal';\r
+               }\r
+               \r
+               // 2. Update description\r
+               $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);\r
+               \r
+               return '';\r
+       }\r
+       /**\r
+        * Admin::skindeleteconfirm()\r
+        * \r
+        * @param       integer $skinid\r
+        * @return      void\r
+        */\r
+       static private function skindeleteconfirm($skinid)\r
+       {\r
+               global $manager;\r
+               \r
+               if ( !preg_match('#^admin/#', self::$action) )\r
+               {\r
+                       $event_identifier = 'Skin';\r
+               }\r
+               else\r
+               {\r
+                       $event_identifier = 'AdminSkin';\r
+               }\r
+               \r
+               $manager->notify("PreDelete{$event_identifier}", array('skinid' => $skinid));\r
+               \r
+               // 1. delete description\r
+               $query = "DELETE FROM %s WHERE sdnumber=%d;";\r
+               $query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);\r
+               DB::execute($query);\r
+               \r
+               // 2. delete parts\r
+               $query = "DELETE FROM %s WHERE sdesc=%d;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               DB::execute($query);\r
+               \r
+               $manager->notify("PostDelete{$event_identifier}", array('skinid' => $skinid));\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinremovetypeconfirm()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $skintype\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skinremovetypeconfirm($skinid, $skintype)\r
+       {\r
+               if ( !preg_match('#^admin/#', self::$action) )\r
+               {\r
+                       $event_identifier = 'Skin';\r
+               }\r
+               else\r
+               {\r
+                       $event_identifier = 'AdminSkin';\r
+               }\r
+               \r
+               if ( !isValidShortName($skintype) )\r
+               {\r
+                       return _ERROR_SKIN_PARTS_SPECIAL_DELETE;\r
+               }\r
+               \r
+               $data =array(\r
+                       'skinid'        => $skinid,\r
+                       'skintype'      => $skintype\r
+               );\r
+               $manager->notify("PreDelete{$event_identifier}Part", $data);\r
+               \r
+               // delete part\r
+               $query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s;';\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );\r
+               DB::execute($query);\r
+               \r
+               $data = array(\r
+                       'skinid'        => $skinid,\r
+                       'skintype'      => $skintype\r
+               );\r
+               $manager->notify("PostDelete{$event_identifier}Part", $data);\r
+               \r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinclone()\r
+        * \r
+        * @param       integer $skinid\r
+        * @param       string  $handler\r
+        * @return      void\r
+        */\r
+       static private function skinclone($skinid, $handler='')\r
+       {\r
+               global $manager;\r
+               \r
+               // 1. read skin to clone\r
+               $skin =& $manager->getSkin($skinid, $handler);\r
+               $name = "{$skin->getName()}_clone";\r
+               \r
+               // if a skin with that name already exists:\r
+               if ( Skin::exists($name) )\r
+               {\r
+                       $i = 1;\r
+                       while ( Skin::exists($name . $i) )\r
+                       {\r
+                               $i++;\r
+                       }\r
+                       $name .= $i;\r
+               }\r
+               \r
+               // 2. create skin desc\r
+               $newid = Skin::createNew(\r
+                       $name,\r
+                       $skin->getDescription(),\r
+                       $skin->getContentType(),\r
+                       $skin->getIncludeMode(),\r
+                       $skin->getIncludePrefix()\r
+               );\r
+               \r
+               // 3. clone\r
+               $query = "SELECT stype FROM %s WHERE sdesc=%d;";\r
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid);\r
+               \r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row )\r
+               {\r
+                       $content = $skin->getContentFromDB($row['stype']);\r
+                       if ( $content )\r
+                       {\r
+                               $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";\r
+                               $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($type));\r
+                               DB::execute($query);\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieimport()\r
+        * \r
+        * @param       string  $mode\r
+        * @param       string  $skinFileRaw\r
+        * @return      string  empty or message if failed\r
+        */\r
+       static private function skinieimport($mode, $skinFileRaw)\r
+       {\r
+               global $DIR_LIBS, $DIR_SKINS;\r
+               \r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               $importer = new SkinImport();\r
+               \r
+               // get full filename\r
+               if ( $mode == 'file' )\r
+               {\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
+               }\r
+               else\r
+               {\r
+                       $skinFile = $skinFileRaw;\r
+               }\r
+               \r
+               // read only metadata\r
+               $error = $importer->readFile($skinFile, 1);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skininfo']   = $importer->getInfo();\r
+               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
+               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
+               \r
+               // clashes\r
+               $skinNameClashes                = $importer->checkSkinNameClashes();\r
+               $templateNameClashes    = $importer->checkTemplateNameClashes();\r
+               $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skinclashes'] = $skinNameClashes;\r
+               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
+               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               \r
+               unset($importer);\r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieedoimport()\r
+        * \r
+        * @param       string  $mode\r
+        * @param       string  $skinFileRaw\r
+        * @param       boolean $allowOverwrite\r
+        * @return      string  empty   or message if failed\r
+        */\r
+       static private function skiniedoimport($mode, $skinFileRaw, $allowOverwrite)\r
+       {\r
+               global $DIR_LIBS, $DIR_SKINS;\r
+               \r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               $importer = new SkinImport();\r
+               \r
+               // get full filename\r
+               if ( $mode == 'file' )\r
+               {\r
+                       $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';\r
+               }\r
+               else\r
+               {\r
+                       $skinFile = $skinFileRaw;\r
+               }\r
+               \r
+               $error = $importer->readFile($skinFile);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               $error = $importer->writeToDatabase($allowOverwrite);\r
+               if ( $error )\r
+               {\r
+                       unset($importer);\r
+                       return $error;\r
+               }\r
+               \r
+               /* TODO: we should consider to use the other way insterad of this */\r
+               $_REQUEST['skininfo']  = $importer->getInfo();\r
+               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
+               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
+               \r
+               unset($importer);\r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Admin::skinieexport()\r
+        * \r
+        * @param       array   $aSkins\r
+        * @param       array   $aTemplates\r
+        * @param       string  $info\r
+        * @return      void\r
+        */\r
+       static private function skinieexport($aSkins, $aTemplates, $info)\r
+       {\r
+               global $DIR_LIBS;\r
+               \r
+               // load skinie class\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               if ( !is_array($aSkins) )\r
+               {\r
+                       $aSkins = array();\r
+               }\r
+               \r
+               if (!is_array($aTemplates))\r
+               {\r
+                       $aTemplates = array();\r
+               }\r
+               \r
+               $skinList = array_keys($aSkins);\r
+               $templateList = array_keys($aTemplates);\r
+               \r
+               $exporter = new SkinExport();\r
+               foreach ( $skinList as $skinId )\r
+               {\r
+                       $exporter->addSkin($skinId);\r
+               }\r
+               foreach ( $templateList as $templateId )\r
+               {\r
+                       $exporter->addTemplate($templateId);\r
+               }\r
+               $exporter->setInfo($info);\r
+               $exporter->export();\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
         * Admin::action_parseSpecialskin()\r
         * \r
         * @param       void\r
@@ -5674,9 +5701,9 @@ class Admin
                $member->isAdmin() or self::disallow();\r
                \r
                include_once($DIR_LIBS . 'Skinie.php');\r
-               $skinFileRaw    = postVar('skinfile');\r
-               $mode                   = postVar('mode');\r
-               $allowOverwrite = intPostVar('overwrite');\r
+               $skinFileRaw = postVar('skinfile');\r
+               $mode = postVar('mode');\r
+               $allowOverwrite = intPostVar('overwrite');\r
                \r
                if ( $mode == 'file' )\r
                {\r
@@ -5692,11 +5719,13 @@ class Admin
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                $error = $importer->writeToDatabase($allowOverwrite);\r
                if ( $error )\r
                {\r
                        self::error($error);\r
+                       return;\r
                }\r
                \r
                $_REQUEST['skininfo']   = $importer->getInfo();\r
@@ -5704,6 +5733,6 @@ class Admin
                $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
                \r
                header('Location: ' . $CONF['AdminURL']);\r
-               exit;\r
+               return;\r
        }\r
 }\r